commit ecc535c6ff5d7f9827019f1876e5f6a99d0c9cc5
author David Pursehouse <david.pursehouse@sonymobile.com> Wed Sep 10 13:12:13 2014 +0200
committer David Pursehouse <david.pursehouse@sonymobile.com> Wed Sep 10 13:40:16 2014 +0200
tree 104a303a579357ee52ecf359819caae6fdcaeef6
parent 13eec766ab6e64a96cff695e19a5d8841cb48366
parent 5afd5b8f00670f2de19367f10ad09d04ff29ccd2

Merge branch 'stable-2.10'

* stable-2.10:
  Release notes for Gerrit 2.9.1
  Set version to 2.9.1
  Display parents for all changes, not only merge commits
  Fix JS plugin load when using non-root Gerrit URLs
  Don't require secondary index when running daemon in slave mode
  Remove fixed limit of results returned by secondary index query

Conflicts:
	gerrit-pgm/src/main/java/com/google/gerrit/pgm/Reindex.java
	gerrit-server/src/main/java/com/google/gerrit/server/index/IndexRewriteImpl.java

Change-Id: I66a9909edc789ee826f5091ca87044e160a25926