HADOOP-11333. Fix deadlock in DomainSocketWatcher when the notification pipe is 
full (zhaoyunjiong via cmccabe)
Moved to 2.6.1


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/05ed6905
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/05ed6905
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/05ed6905

Branch: refs/heads/YARN-1197
Commit: 05ed69058f22ebeccc58faf0be491c269e950526
Parents: 08bd4ed
Author: Vinayakumar B <vinayakum...@apache.org>
Authored: Fri Aug 14 12:53:46 2015 +0530
Committer: Vinayakumar B <vinayakum...@apache.org>
Committed: Fri Aug 14 12:53:46 2015 +0530

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


http://git-wip-us.apache.org/repos/asf/hadoop/blob/05ed6905/hadoop-common-project/hadoop-common/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt 
b/hadoop-common-project/hadoop-common/CHANGES.txt
index 6e48c20..57ef1c5 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -1499,9 +1499,6 @@ Release 2.7.0 - 2015-04-20
     HADOOP-11300. KMS startup scripts must not display the keystore /
     truststore passwords. (Arun Suresh via wang)
 
-    HADOOP-11333. Fix deadlock in DomainSocketWatcher when the notification
-    pipe is full (zhaoyunjiong via cmccabe)
-
     HADOOP-11337. KeyAuthorizationKeyProvider access checks need to be done
     atomically. (Dian Fu via wang)
 
@@ -1885,6 +1882,9 @@ Release 2.6.1 - UNRELEASED
 
     HADOOP-10786. Fix UGI#reloginFromKeytab on Java 8. (Stephen Chu via wheat9)
 
+    HADOOP-11333. Fix deadlock in DomainSocketWatcher when the notification
+    pipe is full (zhaoyunjiong via cmccabe)
+
 Release 2.6.0 - 2014-11-18
 
   INCOMPATIBLE CHANGES

Reply via email to