commit | 12af75284822e55ac8348925a09ea91a1489bcf2 | [log] [tgz] |
---|---|---|
author | David Pursehouse <dpursehouse@collab.net> | Wed Jul 17 14:22:43 2019 +0900 |
committer | David Pursehouse <dpursehouse@collab.net> | Wed Jul 17 14:22:43 2019 +0900 |
tree | da4401e1115c92845c40255d7da99595048c1ec3 | |
parent | 51cd1e7b7b2a4c7f7778d49d64b70e2f617ca714 [diff] | |
parent | 57c0f0be81242067a01f6639a659bbdd3904e274 [diff] |
Merge branch 'stable-2.16' into stable-3.0 * stable-2.16: Cancel pending replications upon shutdown Remove replication event from pending when runway is allowed Change-Id: Icc8842c36e09e3de926ad585a104539a72980059