commit bd6daf110c21ecc939f9855fcd123ef68e3f4a48
author David Pursehouse <dpursehouse@collab.net> Mon May 28 19:24:39 2018 +0900
committer David Pursehouse <dpursehouse@collab.net> Tue May 29 08:52:24 2018 +0900
tree 417058ceb8adbcacdcec44634a84135a12ee122c
parent cfda44032fe2bf4c582646f5a54e943202f88960
parent b35e23aae51615bedb022edaef675c11491434f7

Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  ElasticContainer: Allow to specify the docker container version to create
  ElasticContainer: Include cause in AssumptionViolatedException
  ElasticContainer: Create with static method
  Acceptance tests: Replace embedded ES with docker testcontainer
  Elasticsearch: replace native API in prod w/ REST

Changes to ReindexIT done in Iccf443102 ("Acceptance tests: Replace embedded
ES with docker testcontainer") are reverted in this merge since that test
currently doesn't work with Elasticsearch on stable-2.15 (issue 8799).

Change-Id: I21d8b10ebd450c7dc840846a5a0d836b4243dacc