tree 990477128f61194b23db35826895c855e2bd258f
parent c086da1355e3976de410c43cc00d2f76a7127257
parent edb53f796ad2c54db918e3ee2b3bbec6d46c0f30
author David Pursehouse <dpursehouse@collab.net> 1537338439 +0900
committer David Pursehouse <dpursehouse@collab.net> 1537338439 +0900

Merge branch 'stable-2.15'

* stable-2.15:
  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: Ic1217b4ed7495eb325cb73cfb453775e61a1181b