From 7b29f99ad23b2a87eac17fdcc7b5b29cd6c9b0c0 Mon Sep 17 00:00:00 2001
From: Colin Patrick Mccabe <cmccabe@cloudera.com>
Date: Wed, 8 Oct 2014 14:01:50 -0700
Subject: [PATCH] CHANGES.txt: move HADOOP-10404 underneath branch 2.6

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

diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt
index b7f3e680ff0..05c3e51662f 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -357,9 +357,6 @@ Release 2.7.0 - UNRELEASED
 
   BUG FIXES
 
-    HADOOP-10404. Some accesses to DomainSocketWatcher#closed are not protected
-    by the lock (cmccabe)
-
     HADOOP-11166. Remove ulimit from test-patch.sh. (wang)
 
 Release 2.6.0 - UNRELEASED
@@ -808,6 +805,9 @@ Release 2.6.0 - UNRELEASED
     HADOOP-11169. Fix DelegationTokenAuthenticatedURL to pass the connection
     Configurator to the authenticator. (Arun Suresh via wang)
 
+    HADOOP-10404. Some accesses to DomainSocketWatcher#closed are not protected
+    by the lock (cmccabe)
+
     BREAKDOWN OF HDFS-6134 AND HADOOP-10150 SUBTASKS AND RELATED JIRAS
   
       HADOOP-10734. Implement high-performance secure random number sources.