tag | 28e6c85a871ce4d75e4aa04e67ef4492b012d938 | |
---|---|---|
tagger | David Pursehouse <david.pursehouse@sonymobile.com> | Fri Nov 13 13:00:39 2015 -0800 |
object | 675d9dd370948f0508dbe536dfc65cc6cd3bb00d |
v2.12-rc1
commit | 675d9dd370948f0508dbe536dfc65cc6cd3bb00d | [log] [tgz] |
---|---|---|
author | David Pursehouse <david.pursehouse@sonymobile.com> | Thu Nov 12 17:52:02 2015 -0800 |
committer | David Pursehouse <david.pursehouse@sonymobile.com> | Thu Nov 12 17:52:02 2015 -0800 |
tree | e075c3e1009c12954f5ad69d9f1842f3761acc7c | |
parent | 32e84b1b6131230caf880b0c181f98551edc44c6 [diff] | |
parent | 6ee0a32f594c42a656e9080083e924b34779a4ab [diff] |
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