From 796b94df1ea0269617417bb7889ed4035ed0f5a2 Mon Sep 17 00:00:00 2001 From: Vinayakumar B Date: Fri, 14 Aug 2015 12:53:46 +0530 Subject: [PATCH] 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 --- 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 05c5a56cf6a..609fc358fd7 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/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 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 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-11333. Fix deadlock in DomainSocketWatcher when the notification + pipe is full (zhaoyunjiong via cmccabe) + Release 2.6.0 - 2014-11-18 INCOMPATIBLE CHANGES