tree 3e74f23e8be722224a721d068657606a1d57f2ca
parent 042ead2a5e19eb2d6991aa513bda296b41c5909a
parent 12c5d17867f609b58536fc274f6d32eb60feca44
author David Pursehouse <dpursehouse@collab.net> 1523335409 +0900
committer David Pursehouse <dpursehouse@collab.net> 1523335785 +0900

Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  GerritServerId: Update comment for correct location of server Id
  Index{Activate,Start}Command: Include name in error message when unknown
  Index start/activate command: fix unknown name use
  Index start/activate commands: fix Elastic support

Change-Id: I0227ce9f054b7d904639fcd0c64183a1ab85c344