tree be50016e2d204d6df39a0e180435c3e0e60a5a8c
parent 62bd9ad5b7c83584b49201a16b80ed6e6187a606
parent cf379680976788746200b1780ab7e6eb066f504b
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