commit 6647c6c7cbb97b7b33f298211f91cbeff16b9e56
author Hugo Arès <hugo.ares@ericsson.com> Wed Sep 21 08:01:22 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Sep 21 08:01:22 2016 +0000
tree 87d58389963a24bd64353d1784678fb62fba30a8
parent aa5d14be3e82fc2eaa8157a42d1a114f426b36fe
parent 0456b05003fc6fb7af144f0cfc0afe5ed24b9a0a

Merge "Merge branch 'stable-2.13'"

gerrit-sshd/src/main/java/com/google/gerrit/sshd/BaseCommand.java

diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/BaseCommand.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/BaseCommand.java
index 25fb7a7..3e31fab 100644
--- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/BaseCommand.java
+++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/BaseCommand.java
@@ -385,14 +385,6 @@
     }
   }
 
-  public void checkExclusivity(final Object arg1, final String arg1name,
-      final Object arg2, final String arg2name) throws UnloggedFailure {
-    if (arg1 != null && arg2 != null) {
-      throw new UnloggedFailure(String.format(
-          "%s and %s options are mutually exclusive.", arg1name, arg2name));
-    }
-  }
-
   private final class TaskThunk implements CancelableRunnable, ProjectRunnable {
     private final CommandRunnable thunk;
     private final String taskName;