You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@slider.apache.org by sm...@apache.org on 2014/10/15 03:07:55 UTC
[17/23] git commit: Merge branch 'develop' into
feature/SLIDER-509-registry-funtests
Merge branch 'develop' into feature/SLIDER-509-registry-funtests
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/518accd0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/518accd0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/518accd0
Branch: refs/heads/feature/SLIDER-481_allow_dedicated_handling_of_exports
Commit: 518accd05c0d15775335666245cfcda1f1d56b76
Parents: 7dcdd1c baa79a7
Author: Steve Loughran <st...@apache.org>
Authored: Tue Oct 14 16:10:17 2014 -0700
Committer: Steve Loughran <st...@apache.org>
Committed: Tue Oct 14 16:10:17 2014 -0700
----------------------------------------------------------------------
.../org/apache/slider/client/SliderClient.java | 9 ++++++++-
.../common/params/ActionRegistryArgs.java | 6 +++++-
.../apache/slider/common/params/Arguments.java | 1 +
.../TestStandaloneYarnRegistryAM.groovy | 20 +++++++++++++++++++-
4 files changed, 33 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/518accd0/slider-core/src/main/java/org/apache/slider/client/SliderClient.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/518accd0/slider-core/src/main/java/org/apache/slider/common/params/Arguments.java
----------------------------------------------------------------------
diff --cc slider-core/src/main/java/org/apache/slider/common/params/Arguments.java
index 59c7095,1ea575e..c4203a8
--- a/slider-core/src/main/java/org/apache/slider/common/params/Arguments.java
+++ b/slider-core/src/main/java/org/apache/slider/common/params/Arguments.java
@@@ -81,9 -73,9 +81,10 @@@ public interface Arguments
String ARG_RESOURCE_OPT = "--resopt";
String ARG_RESOURCE_OPT_SHORT = "-ro";
String ARG_SERVICETYPE = "--servicetype";
+ String ARG_SLIDER = "--slider";
String ARG_SYSPROP = "-S";
String ARG_TEMPLATE = "--template";
+ String ARG_USER = "--user";
String ARG_VERBOSE = "--verbose";
String ARG_WAIT = "--wait";
String ARG_ZKPATH = "--zkpath";
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/518accd0/slider-core/src/test/groovy/org/apache/slider/agent/standalone/TestStandaloneYarnRegistryAM.groovy
----------------------------------------------------------------------