You are viewing a plain text version of this content. The canonical link for it is here.
Posted to mapreduce-commits@hadoop.apache.org by ac...@apache.org on 2011/12/30 03:24:46 UTC
svn commit: r1225728 - in
/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project: ./
hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/
Author: acmurthy
Date: Fri Dec 30 02:24:46 2011
New Revision: 1225728
URL: http://svn.apache.org/viewvc?rev=1225728&view=rev
Log:
Merge -c 1225726 from trunk to branch-0.23 to fix MAPREDUCE-3608.
Modified:
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySched.java
Modified: hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt?rev=1225728&r1=1225727&r2=1225728&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt (original)
+++ hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt Fri Dec 30 02:24:46 2011
@@ -327,6 +327,9 @@ Release 0.23.1 - Unreleased
MAPREDUCE-3522. Ensure queues inherit ACLs from parent if they aren't
explicitly specified. (Jonathan Eagles via acmurthy)
+ MAPREDUCE-3608. Fixed compile issue with MAPREDUCE-3522. (mahadev via
+ acmurthy)
+
Release 0.23.0 - 2011-11-01
INCOMPATIBLE CHANGES
Modified: hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySched.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySched.java?rev=1225728&r1=1225727&r2=1225728&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySched.java (original)
+++ hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesCapacitySched.java Fri Dec 30 02:24:46 2011
@@ -93,14 +93,14 @@ public class TestRMWebServicesCapacitySc
CapacitySchedulerConfiguration conf) {
// Define top-level queues
- conf.setQueues(CapacityScheduler.ROOT, new String[] { "a", "b" });
- conf.setCapacity(CapacityScheduler.ROOT, 100);
+ conf.setQueues(CapacitySchedulerConfiguration.ROOT, new String[] { "a", "b" });
+ conf.setCapacity(CapacitySchedulerConfiguration.ROOT, 100);
- final String A = CapacityScheduler.ROOT + ".a";
+ final String A = CapacitySchedulerConfiguration.ROOT + ".a";
conf.setCapacity(A, 10);
conf.setMaximumCapacity(A, 50);
- final String B = CapacityScheduler.ROOT + ".b";
+ final String B = CapacitySchedulerConfiguration.ROOT + ".b";
conf.setCapacity(B, 90);
// Define 2nd-level queues
@@ -209,7 +209,7 @@ public class TestRMWebServicesCapacitySc
for (int j = 0; j < queues.getLength(); j++) {
Element qElem = (Element) queues.item(j);
String qName = WebServicesTestUtils.getXmlString(qElem, "queueName");
- String q = CapacityScheduler.ROOT + "." + qName;
+ String q = CapacitySchedulerConfiguration.ROOT + "." + qName;
verifySubQueueXML(qElem, q);
}
}
@@ -253,7 +253,7 @@ public class TestRMWebServicesCapacitySc
// test subqueues
for (int i = 0; i < arr.length(); i++) {
JSONObject obj = arr.getJSONObject(i);
- String q = CapacityScheduler.ROOT + "." + obj.getString("queueName");
+ String q = CapacitySchedulerConfiguration.ROOT + "." + obj.getString("queueName");
verifySubQueue(obj, q);
}
}