tree 19f603f3ad02c65a606353825d0cc9b3a03502f3
parent 98606eda4a2ea11c523ee982c9def6b7fdad20e0
parent 10ba4516825e6c97e9bdc6efab2a82581f3edc03
author Marco Miller <marco.miller@ericsson.com> 1601668384 -0400
committer Marco Miller <marco.miller@ericsson.com> 1601668384 -0400

Merge branch 'stable-3.2' into master

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

Change-Id: I5215f927f5e0fb27f22d7bb6e4530414b8eaf9a9