Repository: hadoop Updated Branches: refs/heads/trunk fb06c0083 -> afbecbb2c
Update CHANGES.txt to move MR-6059 to 2.7 Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/afbecbb2 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/afbecbb2 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/afbecbb2 Branch: refs/heads/trunk Commit: afbecbb2cc1b49e8c3737e21f91366678868623f Parents: fb06c00 Author: Jason Lowe <jl...@apache.org> Authored: Thu Feb 5 16:43:08 2015 +0000 Committer: Jason Lowe <jl...@apache.org> Committed: Thu Feb 5 16:43:08 2015 +0000 ---------------------------------------------------------------------- hadoop-mapreduce-project/CHANGES.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/afbecbb2/hadoop-mapreduce-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt index be8232a..06da408 100644 --- a/hadoop-mapreduce-project/CHANGES.txt +++ b/hadoop-mapreduce-project/CHANGES.txt @@ -94,8 +94,6 @@ Trunk (Unreleased) MAPREDUCE-6013. [post-HADOOP-9902] mapred version is missing (Akira AJISAKA via aw) - MAPREDUCE-6059. Speed up history server startup time (Siqi Li via aw) - BUG FIXES MAPREDUCE-6191. Improve clearing stale state of Java serialization @@ -282,6 +280,8 @@ Release 2.7.0 - UNRELEASED from key and value at the end of the iteration to save memory. (Zhihai Xu via kasha) + MAPREDUCE-6059. Speed up history server startup time (Siqi Li via aw) + BUG FIXES MAPREDUCE-6210. Use getApplicationAttemptId() instead of getApplicationId()