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 cn...@apache.org on 2013/12/09 23:52:05 UTC
svn commit: r1549699 - in /hadoop/common/branches/HDFS-4685: ./
hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/ResourceSchedulerWrapper.java
Author: cnauroth
Date: Mon Dec 9 22:52:02 2013
New Revision: 1549699
URL: http://svn.apache.org/r1549699
Log:
Merge trunk to HDFS-4685.
Modified:
hadoop/common/branches/HDFS-4685/ (props changed)
hadoop/common/branches/HDFS-4685/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/ResourceSchedulerWrapper.java
Propchange: hadoop/common/branches/HDFS-4685/
------------------------------------------------------------------------------
Merged /hadoop/common/trunk:r1548386-1549698
Modified: hadoop/common/branches/HDFS-4685/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-4685/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/ResourceSchedulerWrapper.java?rev=1549699&r1=1549698&r2=1549699&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-4685/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/ResourceSchedulerWrapper.java (original)
+++ hadoop/common/branches/HDFS-4685/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/ResourceSchedulerWrapper.java Mon Dec 9 22:52:02 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);
+ }
}