tree 729b69b66922805a89c1b34bfd595762d6451f4f
parent a314a8023d0f096f03a56c6f9fbe85062cb29c2a
parent 08cf334ecd1d9a8b78765126de796693898f16fc
author Thomas Draebing <thomas.draebing@sap.com> 1595320730 +0200
committer Thomas Draebing <thomas.draebing@sap.com> 1595320730 +0200

Merge branch 'stable-3.1' into stable-3.2

* stable-3.1:
  Remove the terms slave and master
  Respect container.replica option for Gerrit replica
  Format with google-java-format 1.7

Change-Id: Ic8271d79467caeda0d58926bc6209204e8eba8ee