Repository: hadoop Updated Branches: refs/heads/branch-2.6 2d125f2be -> 9d9e0eaae
Update CHANGES.txt to move MAPREDUCE-6436 from YARN to MAPREDUCE (cherry picked from commit 7092d47fc0b3b792dd31f967c01d460dc089f60b) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/9d9e0eaa Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/9d9e0eaa Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/9d9e0eaa Branch: refs/heads/branch-2.6 Commit: 9d9e0eaae8add75ad50b6f9d63f3f9604664b691 Parents: 2d125f2 Author: Zhihai Xu <z...@apache.org> Authored: Tue Dec 15 21:43:19 2015 -0800 Committer: Zhihai Xu <z...@apache.org> Committed: Tue Dec 15 21:53:22 2015 -0800 ---------------------------------------------------------------------- hadoop-mapreduce-project/CHANGES.txt | 2 ++ hadoop-yarn-project/CHANGES.txt | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/9d9e0eaa/hadoop-mapreduce-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt index ac09f81..4e54ab8 100644 --- a/hadoop-mapreduce-project/CHANGES.txt +++ b/hadoop-mapreduce-project/CHANGES.txt @@ -8,6 +8,8 @@ Release 2.6.4 - UNRELEASED IMPROVEMENTS + MAPREDUCE-6436. JobHistory cache issue. (Kai Sasaki via zxu) + OPTIMIZATIONS BUG FIXES http://git-wip-us.apache.org/repos/asf/hadoop/blob/9d9e0eaa/hadoop-yarn-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index 9f566cc..0fe6bb1 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -27,8 +27,6 @@ Release 2.6.3 - UNRELEASED IMPROVEMENTS - MAPREDUCE-6436. JobHistory cache issue. (Kai Sasaki via zxu) - OPTIMIZATIONS BUG FIXES
