svn commit: r1557294 - in /hadoop/common/branches/HDFS-4685: ./ hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/ResourceSchedulerWrapper.java

[cnauroth]

Author: cnauroth
Date: Sat Jan 11 00:37:23 2014
New Revision: 1557294

URL: http://svn.apache.org/r1557294
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:r1556664-1557293

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=1557294&r1=1557293&r2=1557294&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
 Sat Jan 11 00:37:23 2014
@@ -860,4 +860,9 @@ public class ResourceSchedulerWrapper im
   public List<ApplicationAttemptId> getAppsInQueue(String queue) {
     return scheduler.getAppsInQueue(queue);
   }
+
+  @Override
+  public RMContainer getRMContainer(ContainerId containerId) {
+    return null;
+  }
 }