Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  ElasticContainer: Use Elasticsearch 6.4.1 for V6_4 tests
  AbstractDaemonTest: Don't delete common server path too early
  Fix toolchain definitions for bazel 0.17.1
  Bazel: Bump baseline to 0.17.1

Change-Id: Ied727b76e0bc13ab8cb8d20372514edacc56e70f
This commit is contained in:
David Pursehouse
2018-09-19 14:17:05 +09:00
3 changed files with 9 additions and 39 deletions

View File

@@ -51,7 +51,7 @@ public class ElasticContainer<SELF extends ElasticContainer<SELF>> extends Gener
case V6_3:
return "docker.elastic.co/elasticsearch/elasticsearch-oss:6.3.2";
case V6_4:
return "docker.elastic.co/elasticsearch/elasticsearch-oss:6.4.0";
return "docker.elastic.co/elasticsearch/elasticsearch-oss:6.4.1";
}
throw new IllegalStateException("No tests for version: " + version.name());
}