You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by ar...@apache.org on 2013/12/09 18:38:22 UTC
svn commit: r1549626 - in /hadoop/common/branches/HDFS-2832: ./
hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/ResourceSchedulerWrapper.java
Author: arp
Date: Mon Dec 9 17:38:20 2013
New Revision: 1549626
URL: http://svn.apache.org/r1549626
Log:
Merging r1548329 through r1549625 from trunk to branch HDFS-2832
Modified:
hadoop/common/branches/HDFS-2832/ (props changed)
hadoop/common/branches/HDFS-2832/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/ResourceSchedulerWrapper.java
Propchange: hadoop/common/branches/HDFS-2832/
------------------------------------------------------------------------------
Merged /hadoop/common/trunk:r1548329-1549625
Modified: hadoop/common/branches/HDFS-2832/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/ResourceSchedulerWrapper.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-2832/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/ResourceSchedulerWrapper.java?rev=1549626&r1=1549625&r2=1549626&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-2832/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/ResourceSchedulerWrapper.java (original)
+++ hadoop/common/branches/HDFS-2832/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/ResourceSchedulerWrapper.java Mon Dec 9 17:38:20 2013
@@ -867,5 +867,10 @@ public class ResourceSchedulerWrapper im
ApplicationAttemptId appAttemptId) {
return scheduler.getAppResourceUsageReport(appAttemptId);
}
+
+ @Override
+ public List<ApplicationAttemptId> getAppsInQueue(String queue) {
+ return scheduler.getAppsInQueue(queue);
+ }
}