Merge branch 'stable-2.14' into stable-2.15 * stable-2.14: Documentation: Fix the default peerInfo strategy Switch required bazel version to 0.29.1 Make build tests name consistent with stable-2.15 Change-Id: Ia3efc6ebfba69060f6f1bf6201e4d8aa53624280
diff --git a/.bazelversion b/.bazelversion index 8862dba..25939d3 100644 --- a/.bazelversion +++ b/.bazelversion
@@ -1 +1 @@ -1.0.0rc2 +0.29.1
diff --git a/src/main/resources/Documentation/config.md b/src/main/resources/Documentation/config.md index 04ccafc..bb72501 100644 --- a/src/main/resources/Documentation/config.md +++ b/src/main/resources/Documentation/config.md
@@ -84,7 +84,7 @@ ```peerInfo.strategy``` : Strategy to find other peers. Supported strategies are `static` or `jgroups`. - Defaults to `static`. + Defaults to `jgroups`. * The `static` strategy allows to staticly configure the peer gerrit instance using the configuration parameter `peerInfo.static.url`. * The `jgroups` strategy allows that a gerrit instance discovers the peer