YARN-1907. Merged into branch-2.4 also.

svn merge --ignore-ancestry -c 1585992 ../../trunk/ onto branch-2.4.
Fixed CHANGES.txt entries too.


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1586767 13f79535-47bb-0310-9956-ffa450edef68

hadoop-yarn-project/CHANGES.txt

@@ -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