From ba4474b63fc60d8be8359279f34d5966790681c5 Mon Sep 17 00:00:00 2001
From: Vinod Kumar Vavilapalli <vinodkv@apache.org>
Date: Fri, 11 Apr 2014 20:23:09 +0000
Subject: [PATCH] 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/trunk@1586767 13f79535-47bb-0310-9956-ffa450edef68
---
 hadoop-yarn-project/CHANGES.txt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index 30ae005daeb..c3111fa01d0 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -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