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/12 19:44:59 UTC
[2/2] hadoop git commit: YARN-2843. Merging to branch-2.6 for
hadoop-2.6.0-rc1.
YARN-2843. Merging to branch-2.6 for hadoop-2.6.0-rc1.
(cherry picked from commit 51957ca81886ac3553c44848631fdf53766a25ae)
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/de0073cb
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/de0073cb
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/de0073cb
Branch: refs/heads/branch-2.6
Commit: de0073cbc4f8c4d58eb0f5dfaa8f713c498798c1
Parents: 7a8a413
Author: Arun C. Murthy <ac...@apache.org>
Authored: Wed Nov 12 10:41:24 2014 -0800
Committer: Arun C. Murthy <ac...@apache.org>
Committed: Wed Nov 12 10:44:43 2014 -0800
----------------------------------------------------------------------
hadoop-yarn-project/CHANGES.txt | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/de0073cb/hadoop-yarn-project/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index b2fef10..1718c14 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -862,6 +862,9 @@ Release 2.6.0 - 2014-11-15
YARN-2841. RMProxy should retry EOFException. (Jian He via xgong)
+ YARN-2843. Fixed NodeLabelsManager to trim inputs for hosts and labels so
+ as to make them work correctly. (Wangda Tan via vinodkv)
+
Release 2.5.2 - 2014-11-10
INCOMPATIBLE CHANGES