YARN-2841. 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/3e7a5157 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/3e7a5157 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/3e7a5157 Branch: refs/heads/HDFS-EC Commit: 3e7a5157f05ebc83a57b799518dd2006f204d7a1 Parents: 44feec7 Author: Arun C. Murthy <[email protected]> Authored: Wed Nov 12 10:36:54 2014 -0800 Committer: Arun C. Murthy <[email protected]> Committed: Wed Nov 12 10:36:54 2014 -0800 ---------------------------------------------------------------------- hadoop-yarn-project/CHANGES.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/3e7a5157/hadoop-yarn-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index ec3a331..78fd6ce 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -84,8 +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-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) @@ -949,6 +947,8 @@ Release 2.6.0 - 2014-11-15 consistent with the (somewhat incorrect) behaviour in the non-recovery case. (Jian He via vinodkv) + YARN-2841. RMProxy should retry EOFException. (Jian He via xgong) + Release 2.5.2 - 2014-11-10 INCOMPATIBLE CHANGES
