| commit | 6ad3f1310f9144de9b6e4630bd637427cdc81274 | [log] [tgz] |
|---|---|---|
| author | David Pursehouse <dpursehouse@collab.net> | Fri Sep 21 13:34:41 2018 +0900 |
| committer | David Pursehouse <dpursehouse@collab.net> | Fri Sep 21 13:34:41 2018 +0900 |
| tree | ac86f880b7ca6961c309ef034d547dd2ab8d1780 | |
| parent | b9ed4e7cf152eb9c726b15d1db94a291a4896d45 [diff] | |
| parent | 9658edddbcbf66b5830cfd504cfb25aa31baa173 [diff] |
Merge branch 'stable-2.14' into stable-2.15 * stable-2.14: Set version to 2.14.13 ElasticContainer: Use Elasticsearch 5.6.12 for V5_6 tests Change-Id: I65dc172892f6a5217b1db26e9bab288c530aefd0
diff --git a/gerrit-elasticsearch/src/test/java/com/google/gerrit/elasticsearch/ElasticContainer.java b/gerrit-elasticsearch/src/test/java/com/google/gerrit/elasticsearch/ElasticContainer.java index 27446e5..56c6e6b 100644 --- a/gerrit-elasticsearch/src/test/java/com/google/gerrit/elasticsearch/ElasticContainer.java +++ b/gerrit-elasticsearch/src/test/java/com/google/gerrit/elasticsearch/ElasticContainer.java
@@ -45,7 +45,7 @@ case V2_4: return "elasticsearch:2.4.6-alpine"; case V5_6: - return "docker.elastic.co/elasticsearch/elasticsearch:5.6.11"; + return "docker.elastic.co/elasticsearch/elasticsearch:5.6.12"; case V6_2: return "docker.elastic.co/elasticsearch/elasticsearch-oss:6.2.4"; case V6_3: