From dfd8da777fee7f8582aab584df35d896cc9e2f86 Mon Sep 17 00:00:00 2001 From: Tsuyoshi Ozawa Date: Mon, 9 Mar 2015 12:04:44 +0900 Subject: [PATCH] Moving CHANGES.txt entry for MAPREDUCE-5657 to branch-2. --- hadoop-mapreduce-project/CHANGES.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt index d0d82165ff3..049b17de545 100644 --- a/hadoop-mapreduce-project/CHANGES.txt +++ b/hadoop-mapreduce-project/CHANGES.txt @@ -181,9 +181,6 @@ Trunk (Unreleased) MAPREDUCE-6234. TestHighRamJob fails due to the change in MAPREDUCE-5785. (Masatake Iwasaki via kasha) - MAPREDUCE-5657. Fix Javadoc errors caused by incorrect or illegal tags in doc - comments. (Akira AJISAKA via ozawa) - BREAKDOWN OF MAPREDUCE-2841 (NATIVE TASK) SUBTASKS MAPREDUCE-5985. native-task: Fix build on macosx. Contributed by @@ -417,6 +414,9 @@ Release 2.7.0 - UNRELEASED MAPREDUCE-6136. MRAppMaster doesn't shutdown file systems. (Brahma Reddy Battula via ozawa) + MAPREDUCE-5657. Fix Javadoc errors caused by incorrect or illegal tags in doc + comments. (Akira AJISAKA and Andrew Purtell via ozawa) + Release 2.6.1 - UNRELEASED INCOMPATIBLE CHANGES