gerrit/gerrit-httpd
David Pursehouse ecc535c6ff 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
2014-09-10 13:40:16 +02:00
..
src Merge branch 'stable-2.10' 2014-09-10 13:40:16 +02:00
BUCK Move powermock and easymock library definitions to separate BUCK files 2014-06-30 15:35:13 +00:00