Repository: hadoop Updated Branches: refs/heads/branch-2 b3badf935 -> b390579c1
YARN-2841: Correct fix version from branch-2.6 to branch-2.7 in the change log. (cherry picked from commit 58e9bf4b908e0b21309006eba49899b092f38071) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/b390579c Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/b390579c Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/b390579c Branch: refs/heads/branch-2 Commit: b390579c15fedc35d5b1a24e7fa4cd405531dd2e Parents: b3badf9 Author: Xuan <[email protected]> Authored: Mon Nov 10 18:31:25 2014 -0800 Committer: Xuan <[email protected]> Committed: Mon Nov 10 18:35:59 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/b390579c/hadoop-yarn-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index 9357865..c8db6bb 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -45,6 +45,8 @@ 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) + Release 2.6.0 - 2014-11-15 INCOMPATIBLE CHANGES @@ -902,8 +904,6 @@ 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
