You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@slider.apache.org by st...@apache.org on 2014/08/19 14:23:00 UTC

[46/50] [abbrv] git commit: SLIDER-306 in sync w/ trunk and JDK6

SLIDER-306 in sync w/ trunk and JDK6


Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/f06b37cf
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/f06b37cf
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/f06b37cf

Branch: refs/heads/feature/SLIDER-306_Slider_list_command_live_and_history_options
Commit: f06b37cf415ed0a602f38454096b19d74492a3d4
Parents: 5d59454
Author: Steve Loughran <st...@apache.org>
Authored: Tue Aug 19 11:07:03 2014 +0100
Committer: Steve Loughran <st...@apache.org>
Committed: Tue Aug 19 11:07:03 2014 +0100

----------------------------------------------------------------------
 .../src/main/java/org/apache/slider/client/SliderClient.java     | 2 +-
 .../main/java/org/apache/slider/common/tools/SliderUtils.java    | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/f06b37cf/slider-core/src/main/java/org/apache/slider/client/SliderClient.java
----------------------------------------------------------------------
diff --git a/slider-core/src/main/java/org/apache/slider/client/SliderClient.java b/slider-core/src/main/java/org/apache/slider/client/SliderClient.java
index fb06454..d608278 100644
--- a/slider-core/src/main/java/org/apache/slider/client/SliderClient.java
+++ b/slider-core/src/main/java/org/apache/slider/client/SliderClient.java
@@ -321,7 +321,7 @@ public class SliderClient extends AbstractSliderLaunchedService implements RunSe
           serviceArgs.getActionAMSuicideArgs());
 
     } else if (ACTION_LIST.equals(action)) {
-      exitCode = actionList(clusterName);
+      exitCode = actionList(clusterName, serviceArgs.getActionListArgs());
     } else if (ACTION_REGISTRY.equals(action)) {
       exitCode = actionRegistry(
           serviceArgs.getActionRegistryArgs());

http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/f06b37cf/slider-core/src/main/java/org/apache/slider/common/tools/SliderUtils.java
----------------------------------------------------------------------
diff --git a/slider-core/src/main/java/org/apache/slider/common/tools/SliderUtils.java b/slider-core/src/main/java/org/apache/slider/common/tools/SliderUtils.java
index 6aff38a..3f83855 100644
--- a/slider-core/src/main/java/org/apache/slider/common/tools/SliderUtils.java
+++ b/slider-core/src/main/java/org/apache/slider/common/tools/SliderUtils.java
@@ -579,8 +579,8 @@ public final class SliderUtils {
     if (instances.size() <= 1) {
       return;
     }
-    List<ApplicationReport> nonLiveInstance = new ArrayList<>(instances.size());
-    List<ApplicationReport> liveInstance = new ArrayList<>(instances.size());
+    List<ApplicationReport> nonLiveInstance = new ArrayList<ApplicationReport>(instances.size());
+    List<ApplicationReport> liveInstance = new ArrayList<ApplicationReport>(instances.size());
 
     for (ApplicationReport report : instances) {
       if (report.getYarnApplicationState() == YarnApplicationState.RUNNING