tree 4f22a03786528a689fbeccc5defd3466a86739f3
parent ef5ffc7508627f8c2f86e03c556703aa28c2f134
parent 84d508247c619b9e1871d7ce47517334bb0240c1
author David Pursehouse <dpursehouse@collab.net> 1575523736 +0900
committer David Pursehouse <dpursehouse@collab.net> 1575523736 +0900

Merge branch 'stable-3.1'

* stable-3.1:
  ReplicationIT: Increase timeout for tests
  ReplicationIT: Retry/timeout on assertion of replication tasks count
  Remove unused private methods

Change-Id: I9aaa31161b770c033942e09cb4ec82806bb79c3f