From d6e4c106587a50cabf8accdad94b16f88a54befd Mon Sep 17 00:00:00 2001
From: Allen Wittenauer <aw@apache.org>
Date: Sat, 25 Apr 2015 15:27:08 +0100
Subject: [PATCH] re-align HADOOP-11746 in CHANGES.txt between trunk and
 branch-2

---
 hadoop-common-project/hadoop-common/CHANGES.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt
index e018bc9c019..ec5bb7de7ee 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -4,6 +4,8 @@ Release 2.8.0 - UNRELEASED
 
   INCOMPATIBLE CHANGES
 
+    HADOOP-11746. rewrite test-patch.sh (aw)
+
   NEW FEATURES
 
     HADOOP-11226. Add a configuration to set ipc.Client's traffic class with
@@ -12,8 +14,6 @@ Release 2.8.0 - UNRELEASED
     HADOOP-9477. Add posixGroups support for LDAP groups mapping service.
     (Dapeng Sun via Yongjun Zhang)
 
-    HADOOP-11746. rewrite test-patch.sh (aw)
-
     HADOOP-11843. Make setting up the build environment easier.
     (Niels Basjes via cnauroth)