David Pursehouse e65498896f Merge branch 'stable-2.14' into stable-2.15 ...

* stable-2.14:
  AbstractQueryChangesTest#createInjector: Remove unnecessary 'throws Exception'
  Fix copyAllScoresOnMergeFirstParentUpdate's documentation
  Acceptance tests: Remove ES bootstrap boilerplate

Changes to ReindexIT done in I57e5d0718 ("Acceptance tests: Remove ES
bootstrap boilerplate") are reverted in this merge since that test
currently doesn't work with Elasticsearch on stable-2.15 (issue 8799).

Change-Id: Ie606d29f6d4867e6055482fc227eeab7274d281c

2018-05-28 16:51:52 +09:00

..

java/com/google/gerrit/elasticsearch

Merge branch 'stable-2.14' into stable-2.15

2018-05-28 16:51:52 +09:00