tree e075c3e1009c12954f5ad69d9f1842f3761acc7c
parent 32e84b1b6131230caf880b0c181f98551edc44c6
parent 6ee0a32f594c42a656e9080083e924b34779a4ab
author David Pursehouse <david.pursehouse@sonymobile.com> 1447379522 -0800
committer David Pursehouse <david.pursehouse@sonymobile.com> 1447379522 -0800

Merge branch 'stable-2.11' into stable-2.12

* stable-2.11:
  Destination: parse replication delay and retry as time units
  Remove obsolete remote.NAME.timeout from config documentation

Change-Id: I57016ead4f30def6153b66dee41922cddad36804