tree 5b08c022e9d1fac259c369023e98c540b06cb48d
parent 958a4a949350d2b0c75a042f278515f6da1c726b
parent 7957f93c5b645422adf21c91989fade74729c0e7
author David Pursehouse <dpursehouse@collab.net> 1531787815 +0900
committer David Pursehouse <dpursehouse@collab.net> 1531789905 +0900

Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  ElasticIndexIT: replace member with local variable
  Elasticsearch tests: remove password duplication

Change-Id: I9d71a0f156621b8c528db979577bd7ebcaf9edaf