tree 91d03232d442c66021560b5877432ada47c23747
parent 8c28ecec73a4017588ebddb2e869d88fa571fc64
parent 9f08729c294d327ed6ed34f78ca7a6bff5ac4393
author David Pursehouse <dpursehouse@collab.net> 1584321584 +0900
committer David Pursehouse <dpursehouse@collab.net> 1584321584 +0900

Merge branch 'stable-3.0' into stable-3.1

* stable-3.0:
  Add method to push changes directly to given replica

The commit "Add method to push changes directly to given replica" is
omitted in this merge due to conflicts with refactoring that has been
done in stable-3.1. If this feature is needed later it will be redone
in a new commit.

Change-Id: Iab801b94f029bffe393a30fb33eea50fc755affe