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 2014/11/17 07:30:08 UTC

[06/45] 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.


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/51957ca8
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/51957ca8
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/51957ca8

Branch: refs/heads/HDFS-EC
Commit: 51957ca81886ac3553c44848631fdf53766a25ae
Parents: 3e7a515
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:41:24 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/51957ca8/hadoop-yarn-project/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index 78fd6ce..f869fde 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -84,9 +84,6 @@ Release 2.7.0 - UNRELEASED
     YARN-2713. "RM Home" link in NM should point to one of the RMs in an 
     HA setup. (kasha)
 
-    YARN-2843. Fixed NodeLabelsManager to trim inputs for hosts and labels so
-    as to make them work correctly. (Wangda Tan via vinodkv)
-
 Release 2.6.0 - 2014-11-15
 
   INCOMPATIBLE CHANGES
@@ -949,6 +946,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