opendev/gerrit
Code Issues Proposed changes

Merge "Merge branch 'stable-2.14'" into stable-2.15

Browse Source
This commit is contained in:
Edwin Kempin
2017-10-20 13:31:53 +00:00
committed by Gerrit Code Review
parent aa65019162 2e93768d7c
commit efa8666c48
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/BanCommitCommand.java
View File

@@ -14,7 +14,7 @@
package com.google.gerrit.sshd.commands; package com.google.gerrit.sshd.commands;
import static com.google.gerrit.sshd.CommandMetaData.Mode.MASTER_OR_SLAVE; import static com.google.gerrit.sshd.CommandMetaData.Mode.MASTER;
import com.google.common.base.Joiner; import com.google.common.base.Joiner;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
@@ -34,7 +34,7 @@ import org.kohsuke.args4j.Option;
@CommandMetaData( @CommandMetaData(
name = "ban-commit", name = "ban-commit",
description = "Ban a commit from a project's repository", description = "Ban a commit from a project's repository",
runsAt = MASTER_OR_SLAVE runsAt = MASTER
) )
public class BanCommitCommand extends SshCommand { public class BanCommitCommand extends SshCommand {
@Option( @Option(

1
gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/DefaultCommandModule.java
View File

@@ -95,7 +95,6 @@ public class DefaultCommandModule extends CommandModule {
command("git-receive-pack").to(NotSupportedInSlaveModeFailureCommand.class); command("git-receive-pack").to(NotSupportedInSlaveModeFailureCommand.class);
command("gerrit-receive-pack").to(NotSupportedInSlaveModeFailureCommand.class); command("gerrit-receive-pack").to(NotSupportedInSlaveModeFailureCommand.class);
command(git, "receive-pack").to(NotSupportedInSlaveModeFailureCommand.class); command(git, "receive-pack").to(NotSupportedInSlaveModeFailureCommand.class);
command(gerrit, "test-submit").to(NotSupportedInSlaveModeFailureCommand.class);
} else { } else {
if (sshEnabled()) { if (sshEnabled()) {
command("git-receive-pack").to(Commands.key(git, "receive-pack")); command("git-receive-pack").to(Commands.key(git, "receive-pack"));