tree 8e5b209be94969da1b15a7c3e9efdd5a735ac211
parent 431ae1d809b121c5b71a3385fb924c5036035fdc
parent c301564b6b614ff0bd746f0ab9f4dd851717510b
author David Pursehouse <dpursehouse@collab.net> 1537334225 +0900
committer David Pursehouse <dpursehouse@collab.net> 1537334225 +0900

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