| commit | 070da4fca3fd5a4aa69f3e7c5cf030c445198c24 | [log] [tgz] |
|---|---|---|
| author | David Pursehouse <dpursehouse@collab.net> | Tue Mar 10 10:35:39 2020 +0900 |
| committer | David Pursehouse <dpursehouse@collab.net> | Tue Mar 10 10:35:39 2020 +0900 |
| tree | 6d6de17461850b489f8d6dfc5bc074f7738473ef | |
| parent | 80fdeda5c406f1f64495c9ebf8b72e5accd01d38 [diff] | |
| parent | 9de225e7bf6679e25513c1c9ca2243fc3cee2090 [diff] |
Merge branch 'stable-3.0' into stable-3.1 * stable-3.0: Upgrade testcontainers to 1.13.0 ElasticContainer: Upgrade V7_6 to elasticsearch 7.6.1 Update jetty to 9.4.24.v20191120 Change-Id: I3026e9fc709d03b232424ca8dd203c2528000f08
diff --git a/javatests/com/google/gerrit/elasticsearch/ElasticContainer.java b/javatests/com/google/gerrit/elasticsearch/ElasticContainer.java index 98d723f..96041a1 100644 --- a/javatests/com/google/gerrit/elasticsearch/ElasticContainer.java +++ b/javatests/com/google/gerrit/elasticsearch/ElasticContainer.java
@@ -67,7 +67,7 @@ case V7_5: return "blacktop/elasticsearch:7.5.2"; case V7_6: - return "blacktop/elasticsearch:7.6.0"; + return "blacktop/elasticsearch:7.6.1"; } throw new IllegalStateException("No tests for version: " + version.name()); }