tree c65f5ec85c0fd1def8b7bdbab9b58b24b19ed8ea
parent c72a72058ff03d9d83b09882a9044a75467c4b1f
parent 505f2c63c41100d215e706c7df6932854d213bd7
author David Pursehouse <dpursehouse@collab.net> 1575707904 +0900
committer David Pursehouse <dpursehouse@collab.net> 1575707904 +0900

Merge branch 'stable-3.1'

* stable-3.1:
  Fix ReplicationIT flakiness by listing all persistent tasks
  Revert "ReplicationIT: Retry/timeout on assertion of replication tasks count"
  Revert "ReplicationIT: Increase timeout for tests"

Change-Id: I67824461340b6a693df18de59e11572ceed8ed7a