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/9d1bc9b9
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/9d1bc9b9
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/9d1bc9b9
Branch: refs/heads/branch-2.6.0
Commit: 9d1bc9b925f253a7544b9c49b42ea96340614188
Parents: 601aba7
Author: Arun C. Murthy <acmur...@apache.org>
Authored: Wed Nov 12 10:41:24 2014 -0800
Committer: Arun C. Murthy <acmur...@apache.org>
Committed: Wed Nov 12 10:46:02 2014 -0800
----------------------------------------------------------------------
hadoop-yarn-project/CHANGES.txt | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/9d1bc9b9/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
