Merge branch 'stable-3.2'
* stable-3.2:
Re-enable test-submit for Gerrit server
Change-Id: I4c83406a327de824b6d1df1f77b0ce042ab45013
diff --git a/java/com/google/gerrit/sshd/commands/DefaultCommandModule.java b/java/com/google/gerrit/sshd/commands/DefaultCommandModule.java
index c7fe74e..cfd17f4 100644
--- a/java/com/google/gerrit/sshd/commands/DefaultCommandModule.java
+++ b/java/com/google/gerrit/sshd/commands/DefaultCommandModule.java
@@ -90,9 +90,12 @@
command("git-receive-pack").to(Commands.key(git, "receive-pack"));
command("gerrit-receive-pack").to(Commands.key(git, "receive-pack"));
command(git, "receive-pack").to(Commands.key(gerrit, "receive-pack"));
- command(gerrit, "test-submit").toProvider(new DispatchCommandProvider(testSubmit));
}
}
+
+ if (!slaveMode) {
+ command(gerrit, "test-submit").toProvider(new DispatchCommandProvider(testSubmit));
+ }
command("suexec").to(SuExec.class);
listener().to(ShowCaches.StartupListener.class);