tree 9c4a633d74971ab7b1f7380af9b7af2414adbf5b
parent a1ea646c0e35cea54f98992f7fcc003f3d4e01d1
parent b6796ac413055b05ff599f08e020321d9195f2b6
author Marco Miller <marco.miller@ericsson.com> 1601667820 -0400
committer Marco Miller <marco.miller@ericsson.com> 1601667820 -0400

Merge branch 'stable-3.1' into stable-3.2

* stable-3.1:
  Remove disableDeleteForTesting flag
  ReplicationFanoutIT: Fix invalid replicationDelay setting
  Make the shouldReplicateNewProject test more reliable

Change-Id: I0726006f18c5b832ddbd8f32920b2b5ded137d56