Author: szetszwo Date: Wed Jan 15 06:06:31 2014 New Revision: 1558303 URL: http://svn.apache.org/r1558303 Log: Merge r1555021 through r1558254 from trunk.
Modified: hadoop/common/branches/HDFS-5535/ (props changed) hadoop/common/branches/HDFS-5535/hadoop-project/pom.xml hadoop/common/branches/HDFS-5535/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/ResourceSchedulerWrapper.java Propchange: hadoop/common/branches/HDFS-5535/ ------------------------------------------------------------------------------ Merged /hadoop/common/trunk:r1557039-1558254 Modified: hadoop/common/branches/HDFS-5535/hadoop-project/pom.xml URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-5535/hadoop-project/pom.xml?rev=1558303&r1=1558302&r2=1558303&view=diff ============================================================================== --- hadoop/common/branches/HDFS-5535/hadoop-project/pom.xml (original) +++ hadoop/common/branches/HDFS-5535/hadoop-project/pom.xml Wed Jan 15 06:06:31 2014 @@ -760,7 +760,28 @@ <groupId>com.google.code.findbugs</groupId> <artifactId>jsr305</artifactId> <version>1.3.9</version> - </dependency> + </dependency> + <dependency> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + <version>2.2.2</version> + </dependency> + <dependency> + <groupId>org.codehaus.jettison</groupId> + <artifactId>jettison</artifactId> + <version>1.1</version> + </dependency> + <dependency> + <groupId>com.sun.jersey</groupId> + <artifactId>jersey-client</artifactId> + <version>${jersey.version}</version> + </dependency> + + <dependency> + <groupId>org.glassfish.grizzly</groupId> + <artifactId>grizzly-http-servlet</artifactId> + <version>2.1.2</version> + </dependency> </dependencies> </dependencyManagement> Modified: hadoop/common/branches/HDFS-5535/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-5535/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/ResourceSchedulerWrapper.java?rev=1558303&r1=1558302&r2=1558303&view=diff ============================================================================== --- hadoop/common/branches/HDFS-5535/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/ResourceSchedulerWrapper.java (original) +++ hadoop/common/branches/HDFS-5535/hadoop-tools/hadoop-sls/src/main/java/org/apache/hadoop/yarn/sls/scheduler/ResourceSchedulerWrapper.java Wed Jan 15 06:06:31 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; + } }