Repository: incubator-slider Updated Branches: refs/heads/develop ff7b8c37f -> df413bf28
SLIDER-541 support `slider diagnostics` as alternative to `slider diagnostic` Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/25e00d97 Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/25e00d97 Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/25e00d97 Branch: refs/heads/develop Commit: 25e00d97a959585441f5808d2101f7f31a006d34 Parents: ff7b8c3 Author: Steve Loughran <ste...@apache.org> Authored: Mon Oct 20 12:36:04 2014 +0100 Committer: Steve Loughran <ste...@apache.org> Committed: Mon Oct 20 12:36:04 2014 +0100 ---------------------------------------------------------------------- .../apache/slider/common/params/ActionDiagnosticArgs.java | 10 +++++----- .../org/apache/slider/common/params/SliderActions.java | 1 + 2 files changed, 6 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/25e00d97/slider-core/src/main/java/org/apache/slider/common/params/ActionDiagnosticArgs.java ---------------------------------------------------------------------- diff --git a/slider-core/src/main/java/org/apache/slider/common/params/ActionDiagnosticArgs.java b/slider-core/src/main/java/org/apache/slider/common/params/ActionDiagnosticArgs.java index 0f98ce0..f48f902 100644 --- a/slider-core/src/main/java/org/apache/slider/common/params/ActionDiagnosticArgs.java +++ b/slider-core/src/main/java/org/apache/slider/common/params/ActionDiagnosticArgs.java @@ -3,14 +3,14 @@ package org.apache.slider.common.params; import com.beust.jcommander.Parameter; import com.beust.jcommander.Parameters; -@Parameters(commandNames = {SliderActions.ACTION_DIAGNOSTIC}, -commandDescription = SliderActions.DESCRIBE_ACTION_DIAGNOSTIC) -public class ActionDiagnosticArgs extends AbstractActionArgs -{ +@Parameters( + commandNames = {SliderActions.ACTION_DIAGNOSTIC, SliderActions.ACTION_DIAGNOSTICS}, + commandDescription = SliderActions.DESCRIBE_ACTION_DIAGNOSTIC) +public class ActionDiagnosticArgs extends AbstractActionArgs { @Override public String getActionName() { - return SliderActions.ACTION_DIAGNOSTIC; + return SliderActions.ACTION_DIAGNOSTICS; } @Parameter(names = {ARG_CLIENT}, http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/25e00d97/slider-core/src/main/java/org/apache/slider/common/params/SliderActions.java ---------------------------------------------------------------------- diff --git a/slider-core/src/main/java/org/apache/slider/common/params/SliderActions.java b/slider-core/src/main/java/org/apache/slider/common/params/SliderActions.java index ae575f2..1383bc7 100644 --- a/slider-core/src/main/java/org/apache/slider/common/params/SliderActions.java +++ b/slider-core/src/main/java/org/apache/slider/common/params/SliderActions.java @@ -44,6 +44,7 @@ public interface SliderActions { String ACTION_THAW = "start"; String ACTION_VERSION = "version"; String ACTION_DIAGNOSTIC = "diagnostic"; + String ACTION_DIAGNOSTICS = "diagnostics"; String ACTION_INSTALL_PACKAGE = "install-package"; String ACTION_INSTALL_KEYTAB = "install-keytab"; String DESCRIBE_ACTION_AM_SUICIDE =
