commit efd3144aea4528a2a6b862132a420f15e8978364 Author: Marco Miller Date: Mon Oct 5 10:22:04 2020 -0400 Update git submodules * Update plugins/replication from branch 'stable-3.2' to 10ba4516825e6c97e9bdc6efab2a82581f3edc03 - 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 - Merge branch 'stable-3.0' into stable-3.1 * stable-3.0: Make the shouldReplicateNewProject test more reliable Change-Id: I40ecf25a108f2dfd0926b3fb6ba166a77cf0f039 - Remove disableDeleteForTesting flag Instrumenting the actual code to make tests work is generally a bad practice that can let real issues slip into production code. Removing this flag "Just Works" after fixing one ReplicationFanoutIT test with buggy replicationDelay settings (the parent change of this one). Change-Id: Ia93192eeff0fb76c5c100de597a017b8b1f86025 - ReplicationFanoutIT: Fix invalid replicationDelay setting Setting config values for a remote in replication.config vs the remote's own config file results in the replication.config values being ignored. Fix this by setting the values in each remote's config file. This test had delays added to avoid any flakiness, but the delays weren't working because of this issue. While the test generally passes, the delay makes it safer from races. Change-Id: I4de52425d9b22237c055bfd39f1b852d63d75d2c - Merge branch 'stable-2.16' into stable-3.0 * stable-2.16: Make the shouldReplicateNewProject test more reliable Change-Id: I447043d502987070bc395936484a1cb23a5ddabc - Make the shouldReplicateNewProject test more reliable The ReplicationIT shouldReplicateNewProject was failing regularly on my machine. Improve the timeout for this test so that it explicitly includes the time needed to wait for the project to be created, not just the scheduling and retry times. Change-Id: Ibf3cc3506991b222ded3ee4ddfbd7e2d60341d60 diff --git a/plugins/replication b/plugins/replication index a1ea646..10ba451 160000 --- a/plugins/replication +++ b/plugins/replication @@ -1 +1 @@ -Subproject commit a1ea646c0e35cea54f98992f7fcc003f3d4e01d1 +Subproject commit 10ba4516825e6c97e9bdc6efab2a82581f3edc03