From fec437ac31f312912e8e017100d8fcaafc6692ed Mon Sep 17 00:00:00 2001
From: Jason Lowe <jlowe@apache.org>
Date: Mon, 11 Jan 2016 18:31:10 +0000
Subject: [PATCH] Add MR-5982 and MR-6492 to 2.6.4 (cherry picked from commit
 e5df366707e326d869f72db03b08228b33ff6e46)

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

diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt
index d8a6f293803..87b498e69b7 100644
--- a/hadoop-mapreduce-project/CHANGES.txt
+++ b/hadoop-mapreduce-project/CHANGES.txt
@@ -318,6 +318,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