From afbecbb2cc1b49e8c3737e21f91366678868623f Mon Sep 17 00:00:00 2001 From: Jason Lowe Date: Thu, 5 Feb 2015 16:43:08 +0000 Subject: [PATCH] Update CHANGES.txt to move MR-6059 to 2.7 --- hadoop-mapreduce-project/CHANGES.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt index be8232ac50f..06da40876a1 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()