tree a3e5baea9519d8a23ba5bec984b1eb4278ef3277
parent a80abbea1d8504b367718a906e778b6a1835dfe7
parent f82d40a9b159320daad028013cec0e0b99fabe85
author David Pursehouse <dpursehouse@collab.net> 1530590336 +0900
committer David Pursehouse <dpursehouse@collab.net> 1530590336 +0900

Merge branch 'stable-2.15'

* stable-2.15:
  Elasticsearch: Allow to configure REST client's retry timeout
  ElasticConfiguration: Make hosts private
  config-gerrit: Fix formatting of elasticsearch.name.hostname

Change-Id: I76d072aab5506a3896a45adc92211020afc98c91