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 ha...@apache.org on 2015/03/22 05:46:25 UTC

hadoop git commit: MAPREDUCE-6286. Amend commit to CHANGES.txt for backport into 2.7.0.

Repository: hadoop
Updated Branches:
  refs/heads/branch-2 d43c0da7d -> 40682a4aa


MAPREDUCE-6286. Amend commit to CHANGES.txt for backport into 2.7.0.

(cherry picked from commit 8770c82acc948bc5127afb1c59072718fd04630c)


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/40682a4a
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/40682a4a
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/40682a4a

Branch: refs/heads/branch-2
Commit: 40682a4aad467fd52c228cc83de266df38d4a819
Parents: d43c0da
Author: Harsh J <ha...@cloudera.com>
Authored: Sun Mar 22 10:15:52 2015 +0530
Committer: Harsh J <ha...@cloudera.com>
Committed: Sun Mar 22 10:16:12 2015 +0530

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


http://git-wip-us.apache.org/repos/asf/hadoop/blob/40682a4a/hadoop-mapreduce-project/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt
index 9235798..5ebf835 100644
--- a/hadoop-mapreduce-project/CHANGES.txt
+++ b/hadoop-mapreduce-project/CHANGES.txt
@@ -44,10 +44,6 @@ Release 2.8.0 - UNRELEASED
     MAPREDUCE-5448. MapFileOutputFormat#getReaders bug with hidden
     files/folders. (Maysam Yabandeh via harsh)
 
-    MAPREDUCE-6286. A typo in HistoryViewer makes some code useless, which
-    causes counter limits are not reset correctly.
-    (Zhihai Xu via harsh)
-
     MAPREDUCE-6213. NullPointerException caused by job history server addr not
     resolvable. (Peng Zhang via harsh)
 
@@ -150,6 +146,10 @@ Release 2.7.0 - UNRELEASED
 
   BUG FIXES
 
+    MAPREDUCE-6286. A typo in HistoryViewer makes some code useless, which
+    causes counter limits are not reset correctly.
+    (Zhihai Xu via harsh)
+
     MAPREDUCE-6210. Use getApplicationAttemptId() instead of getApplicationId()
     for logging AttemptId in RMContainerAllocator.java (Leitao Guo via aajisaka)