Moving CHANGES.txt entry for MAPREDUCE-5657 to branch-2.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/f88e63e6 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/f88e63e6 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/f88e63e6 Branch: refs/heads/HDFS-7285 Commit: f88e63e61343d3888fb2a4324b2156f6716ed41e Parents: 662781e Author: Tsuyoshi Ozawa <[email protected]> Authored: Mon Mar 9 12:04:44 2015 +0900 Committer: Jing Zhao <[email protected]> Committed: Mon Mar 9 13:17:55 2015 -0700 ---------------------------------------------------------------------- hadoop-mapreduce-project/CHANGES.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/f88e63e6/hadoop-mapreduce-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt index d0d8216..049b17d 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
