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 jl...@apache.org on 2016/01/11 19:21:30 UTC

hadoop git commit: Move MR-5982 and MR-6492 to the appropriate section

Repository: hadoop
Updated Branches:
  refs/heads/branch-2.6 de92dd582 -> 16d6b9d3e


Move MR-5982 and MR-6492 to the appropriate section


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

Branch: refs/heads/branch-2.6
Commit: 16d6b9d3eb9b37ef921ccd2d68d6af03d56ac920
Parents: de92dd5
Author: Jason Lowe <jl...@apache.org>
Authored: Mon Jan 11 18:20:13 2016 +0000
Committer: Jason Lowe <jl...@apache.org>
Committed: Mon Jan 11 18:20:13 2016 +0000

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


http://git-wip-us.apache.org/repos/asf/hadoop/blob/16d6b9d3/hadoop-mapreduce-project/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt
index 7fb6162..2a5b6ce 100644
--- a/hadoop-mapreduce-project/CHANGES.txt
+++ b/hadoop-mapreduce-project/CHANGES.txt
@@ -10,13 +10,6 @@ Release 2.6.4 - UNRELEASED
 
     MAPREDUCE-6436. JobHistory cache issue. (Kai Sasaki via zxu)
 
-    MAPREDUCE-5982. Task attempts that fail from the ASSIGNED state can
-    disappear (Chang Li via jlowe)
-
-    MAPREDUCE-6492. AsyncDispatcher exit with NPE on
-    TaskAttemptImpl#sendJHStartEventForAssignedFailTask (Bibin A Chundatt via
-    jlowe)
-
   OPTIMIZATIONS
 
   BUG FIXES
@@ -24,6 +17,13 @@ Release 2.6.4 - UNRELEASED
     MAPREDUCE-6577. MR AM unable to load native library without
     MR_AM_ADMIN_USER_ENV set (sjlee)
 
+    MAPREDUCE-5982. Task attempts that fail from the ASSIGNED state can
+    disappear (Chang Li via jlowe)
+
+    MAPREDUCE-6492. AsyncDispatcher exit with NPE on
+    TaskAttemptImpl#sendJHStartEventForAssignedFailTask (Bibin A Chundatt via
+    jlowe)
+
 Release 2.6.3 - 2015-12-17
 
   INCOMPATIBLE CHANGES