Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge -r 1342243:1342244 from trunk. FIXES: MAPREDUCE-4224 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1342245 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Thomas Graves 2012-05-24 13:17:08 +00:00
parent b36a80a731
commit 02a703fac2
3 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hadoop-mapreduce-project/CHANGES.txt
View File

@ -27,7 +27,11 @@ Release 2.0.1-alpha - UNRELEASED
MAPREDUCE-4262. NM gives wrong log message saying "Connected to MAPREDUCE-4262. NM gives wrong log message saying "Connected to
ResourceManager" before trying to connect. (Devaraj K via tgraves) ResourceManager" before trying to connect. (Devaraj K via tgraves)
MAPREDUCE-4276. Allow setting yarn.nodemanager.delete.debug-delay-sec property to "-1" for easier container debugging. (ahmed via tucu) MAPREDUCE-4276. Allow setting yarn.nodemanager.delete.debug-delay-sec
property to "-1" for easier container debugging. (ahmed via tucu)
MAPREDUCE-4224. TestFifoScheduler throws
org.apache.hadoop.metrics2.MetricsException (Devaraj K via tgraves)
Release 2.0.0-alpha - UNRELEASED Release 2.0.0-alpha - UNRELEASED

1
hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestCapacityScheduler.java
View File

@ -85,6 +85,7 @@ public class TestCapacityScheduler {
@After @After
public void tearDown() throws Exception { public void tearDown() throws Exception {
resourceManager.stop();
} }
private org.apache.hadoop.yarn.server.resourcemanager.NodeManager private org.apache.hadoop.yarn.server.resourcemanager.NodeManager

1
hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fifo/TestFifoScheduler.java
View File

@ -64,6 +64,7 @@ public class TestFifoScheduler {
@After @After
public void tearDown() throws Exception { public void tearDown() throws Exception {
resourceManager.stop();
} }
private org.apache.hadoop.yarn.server.resourcemanager.NodeManager private org.apache.hadoop.yarn.server.resourcemanager.NodeManager