opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-3.0' into stable-3.1

Browse Source 
* stable-3.0:
  ElasticContainer: Upgrade V6_8 to elasticsearch 6.8.5
  Documentation: Mention bazelisk alternative beside bazel

Change-Id: I9071a275f8bc5f0b62a144490edca91642ff39b9
This commit is contained in:
Marco Miller
2019-11-22 18:11:16 -05:00
parent d2eee8dee1 d12c6e4f1b
commit 3c0ef628f6
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Documentation/dev-bazel.txt
View File

@@ -10,7 +10,8 @@ To build Gerrit from source, you need:
* Python 2 or 3
* link:https://github.com/nodesource/distributions/blob/master/README.md[Node.js (including npm)]
* Bower (`sudo npm install -g bower`)
* link:https://docs.bazel.build/versions/master/install.html[Bazel]
* link:https://docs.bazel.build/versions/master/install.html[Bazel] directly
or through link:https://github.com/bazelbuild/bazelisk[Bazelisk]
* Maven
* zip, unzip
* gcc

2
javatests/com/google/gerrit/elasticsearch/ElasticContainer.java
View File

@@ -51,7 +51,7 @@ public class ElasticContainer extends ElasticsearchContainer {
case V6_7:
return "blacktop/elasticsearch:6.7.2";
case V6_8:
return "blacktop/elasticsearch:6.8.4";
return "blacktop/elasticsearch:6.8.5";
case V7_0:
return "blacktop/elasticsearch:7.0.1";
case V7_1: