Author: vinodkv
Date: Fri Apr 11 20:23:09 2014
New Revision: 1586767
URL: http://svn.apache.org/r1586767
Log:
YARN-1907. Merged into branch-2.4 also.
svn merge --ignore-ancestry -c 1585992 ../../trunk/ onto branch-2.4.
Fixed CHANGES.txt entries too.
Modified:
hadoop/common/branches/branch-2.4/hadoop-yarn-project/CHANGES.txt
hadoop/common/branches/branch-2.4/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/ahs/TestRMApplicationHistoryWriter.java
hadoop/common/branches/branch-2/hadoop-yarn-project/CHANGES.txt
hadoop/common/trunk/hadoop-yarn-project/CHANGES.txt
Modified: hadoop/common/branches/branch-2.4/hadoop-yarn-project/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.4/hadoop-yarn-project/CHANGES.txt?rev=1586767&r1=1586766&r2=1586767&view=diff
==============================================================================
--- hadoop/common/branches/branch-2.4/hadoop-yarn-project/CHANGES.txt (original)
+++ hadoop/common/branches/branch-2.4/hadoop-yarn-project/CHANGES.txt Fri Apr
11 20:23:09 2014
@@ -47,6 +47,9 @@ Release 2.4.1 - UNRELEASED
HDFS paths and thus avoid test failures on Windows. (Varun Vasudev via
vinodkv)
+ YARN-1907. TestRMApplicationHistoryWriter#testRMWritingMassiveHistory
+ intermittently fails. (Mit Desai via kihwal)
+
Release 2.4.0 - 2014-04-07
INCOMPATIBLE CHANGES
Modified:
hadoop/common/branches/branch-2.4/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/ahs/TestRMApplicationHistoryWriter.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.4/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/ahs/TestRMApplicationHistoryWriter.java?rev=1586767&r1=1586766&r2=1586767&view=diff
==============================================================================
---
hadoop/common/branches/branch-2.4/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/ahs/TestRMApplicationHistoryWriter.java
(original)
+++
hadoop/common/branches/branch-2.4/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/ahs/TestRMApplicationHistoryWriter.java
Fri Apr 11 20:23:09 2014
@@ -439,7 +439,7 @@ public class TestRMApplicationHistoryWri
int cleanedSize = cleaned.size();
waitCount = 0;
while (cleanedSize < allocatedSize && waitCount++ < 200) {
- Thread.sleep(100);
+ Thread.sleep(300);
resp = nm.nodeHeartbeat(true);
cleaned = resp.getContainersToCleanup();
cleanedSize += cleaned.size();
Modified: hadoop/common/branches/branch-2/hadoop-yarn-project/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-yarn-project/CHANGES.txt?rev=1586767&r1=1586766&r2=1586767&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-yarn-project/CHANGES.txt (original)
+++ hadoop/common/branches/branch-2/hadoop-yarn-project/CHANGES.txt Fri Apr 11
20:23:09 2014
@@ -50,9 +50,6 @@ Release 2.5.0 - UNRELEASED
YARN-1784. TestContainerAllocation assumes CapacityScheduler.
(Robert Kanter via kasha)
- YARN-1907. TestRMApplicationHistoryWriter#testRMWritingMassiveHistory
- intermittently fails. (Mit Desai via kihwal)
-
Release 2.4.1 - UNRELEASED
INCOMPATIBLE CHANGES
@@ -100,6 +97,9 @@ Release 2.4.1 - UNRELEASED
HDFS paths and thus avoid test failures on Windows. (Varun Vasudev via
vinodkv)
+ YARN-1907. TestRMApplicationHistoryWriter#testRMWritingMassiveHistory
+ intermittently fails. (Mit Desai via kihwal)
+
Release 2.4.0 - 2014-04-07
INCOMPATIBLE CHANGES
Modified: hadoop/common/trunk/hadoop-yarn-project/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-yarn-project/CHANGES.txt?rev=1586767&r1=1586766&r2=1586767&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-yarn-project/CHANGES.txt (original)
+++ hadoop/common/trunk/hadoop-yarn-project/CHANGES.txt Fri Apr 11 20:23:09 2014
@@ -65,9 +65,6 @@ Release 2.5.0 - UNRELEASED
YARN-1784. TestContainerAllocation assumes CapacityScheduler.
(Robert Kanter via kasha)
- YARN-1907. TestRMApplicationHistoryWriter#testRMWritingMassiveHistory
- intermittently fails. (Mit Desai via kihwal)
-
Release 2.4.1 - UNRELEASED
INCOMPATIBLE CHANGES
@@ -115,6 +112,9 @@ Release 2.4.1 - UNRELEASED
HDFS paths and thus avoid test failures on Windows. (Varun Vasudev via
vinodkv)
+ YARN-1907. TestRMApplicationHistoryWriter#testRMWritingMassiveHistory
+ intermittently fails. (Mit Desai via kihwal)
+
Release 2.4.0 - 2014-04-07
INCOMPATIBLE CHANGES
