You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by oz...@apache.org on 2015/03/09 04:06:38 UTC

hadoop git commit: Moving CHANGES.txt entry for MAPREDUCE-5657 to branch-2.

Repository: hadoop
Updated Branches:
  refs/heads/trunk 790aa6790 -> dfd8da777


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/dfd8da77
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/dfd8da77
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/dfd8da77

Branch: refs/heads/trunk
Commit: dfd8da777fee7f8582aab584df35d896cc9e2f86
Parents: 790aa67
Author: Tsuyoshi Ozawa <oz...@apache.org>
Authored: Mon Mar 9 12:04:44 2015 +0900
Committer: Tsuyoshi Ozawa <oz...@apache.org>
Committed: Mon Mar 9 12:05:08 2015 +0900

----------------------------------------------------------------------
 hadoop-mapreduce-project/CHANGES.txt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/dfd8da77/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