tree d4074dbcddef35b9de7544b7d405bffc19b78dfc
parent bfad9eddaca20ffb4294cf6283e1e325ecdedf6e
parent e65498896fa3f9847e6a6a29dba05643295f8306
author David Pursehouse <dpursehouse@collab.net> 1527599596 +0900
committer David Pursehouse <dpursehouse@collab.net> 1527600189 +0900

Merge branch 'stable-2.15'

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

AbstractQueryProjectsTest and ElasticQueryProjectsTest are adapted to
the changes done in I57e5d0718 ("Acceptance tests: Remove ES bootstrap
boilerplate").

Change-Id: I09d583eb1115981ac8fa0e1e3fedec16cf9555f7