tree 457731808a6afb1ac0971f30ea5530e2089a611f
parent a236eb24b067157e3737928c267b8463abf01ee2
parent ba1f8b50e4f2063258258487dd30a5a4547a098b
author David Pursehouse <dpursehouse@collab.net> 1530748556 +0900
committer David Pursehouse <dpursehouse@collab.net> 1530748556 +0900

Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  ElasticTestUtils: Set index.maxLimit as integer rather than string
  ElasticConfigurationTest: Add tests for elasticsearch.maxRetryTimeout
  ElasticConfigurationTest: Add tests for elasticsearch.prefix
  ElasticConfigurationTest: Add tests for elasticsearch.{username,password}
  ElasticConfiguration: Extract constants to statics
  Elasticsearch: Simplify configuration of servers

Change-Id: Ic579d37734f285043f2d5ea9b764ec75cb485768