commit 965d62d6bed87946a57eef1b5ed743f47bc6ca94
author David Pursehouse <dpursehouse@collab.net> Tue Nov 27 15:49:51 2018 +0900
committer David Pursehouse <dpursehouse@collab.net> Tue Nov 27 15:49:51 2018 +0900
tree acf17b0bb1eba49d1e9738bc67a70062b8d47551
parent bccd5408af2270bb1c3ccc247344b92894e42943
parent e66e959dda918b04cfb176731847bd51cec1dfbc

Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  Upgrade elasticsearch-rest-client to 6.5.1

Change-Id: I57d998de50909f2780115b822f53c0d1884df730

WORKSPACE

diff --git a/WORKSPACE b/WORKSPACE
index 8ea46e3..0825969 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -1091,8 +1091,8 @@
 # and httpasyncclient as necessary.
 maven_jar(
     name = "elasticsearch-rest-client",
-    artifact = "org.elasticsearch.client:elasticsearch-rest-client:6.5.0",
-    sha1 = "241436d27cf65b84d17126dc7b6b947e8e2c173c",
+    artifact = "org.elasticsearch.client:elasticsearch-rest-client:6.5.1",
+    sha1 = "d87892e24ef361b9fff5435246b0f0b8f4561fe8",
 )
 
 JACKSON_VERSION = "2.9.7"

javatests/com/google/gerrit/elasticsearch/ElasticContainer.java

diff --git a/javatests/com/google/gerrit/elasticsearch/ElasticContainer.java b/javatests/com/google/gerrit/elasticsearch/ElasticContainer.java
index c3150f1..0b5ef6e 100644
--- a/javatests/com/google/gerrit/elasticsearch/ElasticContainer.java
+++ b/javatests/com/google/gerrit/elasticsearch/ElasticContainer.java
@@ -53,7 +53,7 @@
       case V6_4:
         return "docker.elastic.co/elasticsearch/elasticsearch-oss:6.4.3";
       case V6_5:
-        return "docker.elastic.co/elasticsearch/elasticsearch-oss:6.5.0";
+        return "docker.elastic.co/elasticsearch/elasticsearch-oss:6.5.1";
     }
     throw new IllegalStateException("No tests for version: " + version.name());
   }