You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by vi...@apache.org on 2015/08/14 09:27:22 UTC
[3/4] hadoop git commit: HADOOP-11333. Fix deadlock in
DomainSocketWatcher when the notification pipe is full (zhaoyunjiong via
cmccabe) Moved to 2.6.1
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
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/796b94df
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/796b94df
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/796b94df
Branch: refs/heads/branch-2
Commit: 796b94df1ea0269617417bb7889ed4035ed0f5a2
Parents: 15760a1
Author: Vinayakumar B <vi...@apache.org>
Authored: Fri Aug 14 12:53:46 2015 +0530
Committer: Vinayakumar B <vi...@apache.org>
Committed: Fri Aug 14 12:55:25 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/796b94df/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 05c5a56..609fc35 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