From d67214fd69f44391b7b43f7b7d18d8eefc3dd2da Mon Sep 17 00:00:00 2001
From: Jian He <jianhe@apache.org>
Date: Wed, 22 Oct 2014 10:50:07 -0700
Subject: [PATCH] Updated CHANGES.txt to move MAPREDUCE-6126 to 2.6

---
 hadoop-mapreduce-project/CHANGES.txt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt
index 37f973af63..84016b907e 100644
--- a/hadoop-mapreduce-project/CHANGES.txt
+++ b/hadoop-mapreduce-project/CHANGES.txt
@@ -224,9 +224,6 @@ Trunk (Unreleased)
 
     MAPREDUCE-6078. native-task: fix gtest build on macosx (Binglin Chang)
 
-    MAPREDUCE-6126. Fixed Rumen JobBuilder to ignore NormalizedResourceEvent.
-    (Junping Du via jianhe)
-
 Release 2.7.0 - UNRELEASED
 
   INCOMPATIBLE CHANGES
@@ -441,6 +438,9 @@ Release 2.6.0 - UNRELEASED
     MAPREDUCE-5542. Killing a job just as it finishes can generate an NPE in
     client (Rohith via jlowe)
 
+    MAPREDUCE-6126. Fixed Rumen JobBuilder to ignore NormalizedResourceEvent.
+    (Junping Du via jianhe)
+
 Release 2.5.1 - 2014-09-05
 
   INCOMPATIBLE CHANGES