浏览代码

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

(cherry picked from commit 05ed69058f22ebeccc58faf0be491c269e950526)

Conflicts:
hadoop-common-project/hadoop-common/CHANGES.txt

Vinayakumar B 9 年之前
父节点
当前提交
796b94df1e
共有 1 个文件被更改,包括 3 次插入3 次删除
  1. 3 3
      hadoop-common-project/hadoop-common/CHANGES.txt

+ 3 - 3
hadoop-common-project/hadoop-common/CHANGES.txt

@@ -1013,9 +1013,6 @@ Release 2.7.0 - 2015-04-20
     HADOOP-11257. Update "hadoop jar" documentation to warn against using it
     HADOOP-11257. Update "hadoop jar" documentation to warn against using it
     for launching yarn jars (iwasakims via cmccabe)
     for launching yarn jars (iwasakims via cmccabe)
 
 
-    HADOOP-11333. Fix deadlock in DomainSocketWatcher when the notification
-    pipe is full (zhaoyunjiong via cmccabe)
-
     HADOOP-11337. KeyAuthorizationKeyProvider access checks need to be done
     HADOOP-11337. KeyAuthorizationKeyProvider access checks need to be done
     atomically. (Dian Fu via wang)
     atomically. (Dian Fu via wang)
 
 
@@ -1407,6 +1404,9 @@ Release 2.6.1 - UNRELEASED
 
 
     HADOOP-10786. Fix UGI#reloginFromKeytab on Java 8. (Stephen Chu via wheat9)
     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
 Release 2.6.0 - 2014-11-18
 
 
   INCOMPATIBLE CHANGES
   INCOMPATIBLE CHANGES