tree c632dfca317feb76f7d0e89d8e3f8e3179a0f818
parent a50119831fc6c06568ea08b7505bb847c795dca4
parent 6843bdc8732eb9c0cf2d65e314658bbf8fc3d0e8
author David Pursehouse <dpursehouse@collab.net> 1543887576 +0900
committer David Pursehouse <dpursehouse@collab.net> 1543889137 +0900

Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  ElasticContainer: Remove unneeded environment setting
  Remove redundant "testName" methods from Elasticsearch tests
  ElasticVersionTest: Add supportedVersion asserts for V7_0
  Add support for Elasticsearch 7
  Allow to set Elasticsearch number of shards and replicas
  Discontinue support for Elasticsearch 2.4.x
  ElasticSetting.Builder: Make methods return 'this'
  Add link to security documentation for Elasticsearch 6.5
  ElasticVersionTest: Add missing tests for 6.5.x

This merge also makes necessary changes related to the project index
which is not implemented on stable-2.15:

- Remove the tests for version 2.4.x
- Add tests for version 7

Change-Id: Id39158eb94aa71a8a5b22702ccc2009f4ce48b8c