tree f2272de83f549bf827317d13203873b063fa3ab6
parent b8895b93180d236d745c1bedb24eb2c8650d986b
parent 434edc81349b5c6efcbcadd809c71d13c787296d
author David Pursehouse <dpursehouse@collab.net> 1568244438 +0900
committer David Pursehouse <dpursehouse@collab.net> 1568244438 +0900

Merge branch 'stable-2.16' into stable-3.0

* stable-2.16:
  Do not synchronize replication config shutdown

Change-Id: Ia8870aa9b4692825b3d878d7546e8c1d7cf45726