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:04:52 UTC
hadoop git commit: YARN-2853. Merging to branch-2.6 for
hadoop-2.6.0-rc1.
Repository: hadoop
Updated Branches:
refs/heads/trunk 3651fe1b0 -> d648e60eb
YARN-2853. Merging to branch-2.6 for hadoop-2.6.0-rc1.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/d648e60e
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/d648e60e
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/d648e60e
Branch: refs/heads/trunk
Commit: d648e60ebab7f1942dba92e9cd2cb62b8d70419b
Parents: 3651fe1
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:04:45 2014 -0800
----------------------------------------------------------------------
hadoop-yarn-project/CHANGES.txt | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/d648e60e/hadoop-yarn-project/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index 32e9e19..2179faf 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -87,9 +87,6 @@ Release 2.7.0 - UNRELEASED
YARN-2603. ApplicationConstants missing HADOOP_MAPRED_HOME (Ray Chiang via
aw)
- 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.6.0 - 2014-11-15
INCOMPATIBLE CHANGES
@@ -962,6 +959,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