From 32032ace217782618b996f5f763ec579d28348f9 Mon Sep 17 00:00:00 2001
From: "Arun C. Murthy" <acmurthy@apache.org>
Date: Thu, 13 Nov 2014 10:04:45 -0800
Subject: [PATCH] YARN-2853. Merging to branch-2.6 for hadoop-2.6.0-rc1.

(cherry picked from commit d648e60ebab7f1942dba92e9cd2cb62b8d70419b)

Conflicts:
	hadoop-yarn-project/CHANGES.txt
---
 hadoop-yarn-project/CHANGES.txt | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index b8bb9a91cfa..69e21ee8e9b 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -873,6 +873,9 @@ Release 2.6.0 - 2014-11-15
     reacquireContainer() that interrupted by NodeManager restart. (Junping Du
     via jlowe)
 
+    YARN-2853. Fixed a bug in ResourceManager causing apps to hang when the user
+    kill request races with ApplicationMaster finish. (Jian He via vinodkv)
+
 Release 2.5.2 - 2014-11-10
 
   INCOMPATIBLE CHANGES