Return-Path: X-Original-To: apmail-hadoop-common-commits-archive@www.apache.org Delivered-To: apmail-hadoop-common-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 9C9D9F201 for ; Thu, 13 Nov 2014 18:40:44 +0000 (UTC) Received: (qmail 89828 invoked by uid 500); 13 Nov 2014 18:40:44 -0000 Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org Received: (qmail 89763 invoked by uid 500); 13 Nov 2014 18:40:44 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: common-dev@hadoop.apache.org Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 89745 invoked by uid 99); 13 Nov 2014 18:40:44 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 13 Nov 2014 18:40:44 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id D12F6A14F61; Thu, 13 Nov 2014 18:40:43 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: acmurthy@apache.org To: common-commits@hadoop.apache.org Date: Thu, 13 Nov 2014 18:40:44 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [2/2] hadoop git commit: YARN-2853. Merging to branch-2.6 for hadoop-2.6.0-rc1. YARN-2853. Merging to branch-2.6 for hadoop-2.6.0-rc1. (cherry picked from commit d648e60ebab7f1942dba92e9cd2cb62b8d70419b) Conflicts: hadoop-yarn-project/CHANGES.txt Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/32032ace Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/32032ace Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/32032ace Branch: refs/heads/branch-2.6 Commit: 32032ace217782618b996f5f763ec579d28348f9 Parents: 5602095 Author: Arun C. Murthy Authored: Thu Nov 13 10:04:45 2014 -0800 Committer: Arun C. Murthy Committed: Thu Nov 13 10:40:33 2014 -0800 ---------------------------------------------------------------------- hadoop-yarn-project/CHANGES.txt | 3 +++ 1 file changed, 3 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/32032ace/hadoop-yarn-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index b8bb9a9..69e21ee 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