tree 3a0b638cdd88e06475b7db1a3b38f299a767bd0e
parent 35d87c092ea7ef55085f2608917a85b2bd909b2f
parent f88c39a52c45933f0196b94e570904383aa865ec
author David Pursehouse <dpursehouse@collab.net> 1503471158 +0900
committer David Pursehouse <dpursehouse@collab.net> 1503471158 +0900

Merge branch 'stable-2.14'

* stable-2.14:
  Fix minor nits in documentation of replication.maxRetries
  Use rescheduleDelay instead of replicationDelay when rescheduling
  Fix race condition when scheduling a replication

Change-Id: I45c6f5a266709e2ce85d2140f13e4ece7da69341