tree 57ea59dd7cf663e311741c151956d43bddad07ff
parent 8b3324c69e25a7f0f369000960ad48ac5995ed32
parent b241d1379f1843432a8d6a9f6f66a1e8ec1fdde4
author David Pursehouse <dpursehouse@collab.net> 1531305821 +0900
committer David Pursehouse <dpursehouse@collab.net> 1531305821 +0900

Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  Elasticsearch: run no other test at the same time
  ElasticVersionTest: run it through bazel as well
  Elasticsearch: cover V5 and flaky V6 tests -for CI
  Split Elasticsearch query tests into separate rules
  dev-contributing: Document that we format .bzl files with buildifier

Change-Id: I42b9f45dc80156c687a4456b20babadf28ff57a7