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 D86B1182BB for ; Tue, 5 Jan 2016 08:41:10 +0000 (UTC) Received: (qmail 19079 invoked by uid 500); 5 Jan 2016 08:41:10 -0000 Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org Received: (qmail 19017 invoked by uid 500); 5 Jan 2016 08:41:10 -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 19008 invoked by uid 99); 5 Jan 2016 08:41:10 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 05 Jan 2016 08:41:10 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 7C5D5DFF10; Tue, 5 Jan 2016 08:41:10 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: zxu@apache.org To: common-commits@hadoop.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: hadoop git commit: update CHANGES.txt to add YARN-3697 to 2.6.4 release Date: Tue, 5 Jan 2016 08:41:10 +0000 (UTC) Repository: hadoop Updated Branches: refs/heads/trunk 6da6d8787 -> 96d8f1d6f update CHANGES.txt to add YARN-3697 to 2.6.4 release Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/96d8f1d6 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/96d8f1d6 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/96d8f1d6 Branch: refs/heads/trunk Commit: 96d8f1d6f30299831dde3985a6a3bd08cb36fd38 Parents: 6da6d87 Author: Zhihai Xu Authored: Tue Jan 5 00:37:50 2016 -0800 Committer: Zhihai Xu Committed: Tue Jan 5 00:37:50 2016 -0800 ---------------------------------------------------------------------- hadoop-yarn-project/CHANGES.txt | 3 +++ 1 file changed, 3 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/96d8f1d6/hadoop-yarn-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index cc8acbc..28935c6 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -2127,6 +2127,9 @@ Release 2.6.4 - UNRELEASED YARN-4452. NPE when submit Unmanaged application. (Naganarasimha G R via junping_du) + YARN-3697. FairScheduler: ContinuousSchedulingThread can fail to shutdown. + (Zhihai Xu via kasha) + Release 2.6.3 - 2015-12-17 INCOMPATIBLE CHANGES