Repository: hadoop Updated Branches: refs/heads/branch-2 dd3867ab9 -> 65cbac9de
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/65cbac9d Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/65cbac9d Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/65cbac9d Branch: refs/heads/branch-2 Commit: 65cbac9de44da7ade119ff5e593bb8dcb4401a2e Parents: dd3867a 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:49: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/65cbac9d/hadoop-mapreduce-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt index 37e20d3..499840b 100644 --- a/hadoop-mapreduce-project/CHANGES.txt +++ b/hadoop-mapreduce-project/CHANGES.txt @@ -680,6 +680,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/65cbac9d/hadoop-yarn-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index cedcc50..22e4518 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -1984,8 +1984,6 @@ Release 2.6.4 - UNRELEASED IMPROVEMENTS - MAPREDUCE-6436. JobHistory cache issue. (Kai Sasaki via zxu) - OPTIMIZATIONS BUG FIXES
