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 ac...@apache.org on 2014/11/13 19:40:44 UTC
[2/2] hadoop git commit: YARN-2853. Merging to branch-2.6 for
hadoop-2.6.0-rc1.
YARN-2853. Merging to branch-2.6 for hadoop-2.6.0-rc1.
(cherry picked from commit d648e60ebab7f1942dba92e9cd2cb62b8d70419b)
Conflicts:
hadoop-yarn-project/CHANGES.txt
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/32032ace
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/32032ace
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/32032ace
Branch: refs/heads/branch-2.6
Commit: 32032ace217782618b996f5f763ec579d28348f9
Parents: 5602095
Author: Arun C. Murthy <ac...@apache.org>
Authored: Thu Nov 13 10:04:45 2014 -0800
Committer: Arun C. Murthy <ac...@apache.org>
Committed: Thu Nov 13 10:40:33 2014 -0800
----------------------------------------------------------------------
hadoop-yarn-project/CHANGES.txt | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/32032ace/hadoop-yarn-project/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index b8bb9a9..69e21ee 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -873,6 +873,9 @@ Release 2.6.0 - 2014-11-15
reacquireContainer() that interrupted by NodeManager restart. (Junping Du
via jlowe)
+ YARN-2853. Fixed a bug in ResourceManager causing apps to hang when the user
+ kill request races with ApplicationMaster finish. (Jian He via vinodkv)
+
Release 2.5.2 - 2014-11-10
INCOMPATIBLE CHANGES