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
This commit is contained in:
David Pursehouse
2014-09-10 13:12:13 +02:00
14 changed files with 214 additions and 26 deletions

View File

@@ -14,8 +14,6 @@
package com.google.gerrit.sshd.commands;
import static com.google.gerrit.sshd.CommandMetaData.Mode.MASTER_OR_SLAVE;
import com.google.gerrit.server.query.change.QueryProcessor;
import com.google.gerrit.sshd.CommandMetaData;
import com.google.gerrit.sshd.SshCommand;
@@ -26,8 +24,7 @@ import org.kohsuke.args4j.Option;
import java.util.List;
@CommandMetaData(name = "query", description = "Query the change database",
runsAt = MASTER_OR_SLAVE)
@CommandMetaData(name = "query", description = "Query the change database")
class Query extends SshCommand {
@Inject
private QueryProcessor processor;