Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  Elasticsearch: Add support and tests for version 7.2
  js.bzl: Stop using invalid join call

Also adjust ElasticV7QueryProjectsTest to use V7_2.

Change-Id: Ieba5f019a4f7ebe08ea42f8a29840aa496a4abf0
This commit is contained in:
David Pursehouse
2019-07-04 16:44:22 +09:00
11 changed files with 20 additions and 11 deletions

View File

@@ -41,7 +41,7 @@ public class ElasticV7QueryAccountsTest extends AbstractQueryAccountsTest {
return;
}
container = ElasticContainer.createAndStart(ElasticVersion.V7_1);
container = ElasticContainer.createAndStart(ElasticVersion.V7_2);
nodeInfo = new ElasticNodeInfo(container.getHttpHost().getPort());
}