Return-Path: X-Original-To: apmail-hadoop-yarn-commits-archive@minotaur.apache.org Delivered-To: apmail-hadoop-yarn-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id B4993F657 for ; Thu, 4 Apr 2013 21:25:51 +0000 (UTC) Received: (qmail 96406 invoked by uid 500); 4 Apr 2013 21:25:51 -0000 Delivered-To: apmail-hadoop-yarn-commits-archive@hadoop.apache.org Received: (qmail 96344 invoked by uid 500); 4 Apr 2013 21:25:51 -0000 Mailing-List: contact yarn-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: yarn-commits@hadoop.apache.org Delivered-To: mailing list yarn-commits@hadoop.apache.org Received: (qmail 96336 invoked by uid 99); 4 Apr 2013 21:25:51 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 04 Apr 2013 21:25:51 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 04 Apr 2013 21:25:49 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 8857323888E7; Thu, 4 Apr 2013 21:25:28 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1464772 - /hadoop/common/trunk/hadoop-yarn-project/CHANGES.txt Date: Thu, 04 Apr 2013 21:25:28 -0000 To: yarn-commits@hadoop.apache.org From: sseth@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130404212528.8857323888E7@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: sseth Date: Thu Apr 4 21:25:28 2013 New Revision: 1464772 URL: http://svn.apache.org/r1464772 Log: Updated CHANGES.txt to reflect YARN-470 being merged into branch-2.0.4-alpha. Modified: hadoop/common/trunk/hadoop-yarn-project/CHANGES.txt Modified: hadoop/common/trunk/hadoop-yarn-project/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-yarn-project/CHANGES.txt?rev=1464772&r1=1464771&r2=1464772&view=diff ============================================================================== --- hadoop/common/trunk/hadoop-yarn-project/CHANGES.txt (original) +++ hadoop/common/trunk/hadoop-yarn-project/CHANGES.txt Thu Apr 4 21:25:28 2013 @@ -154,9 +154,6 @@ Release 2.0.5-beta - UNRELEASED YARN-485. TestProcfsProcessTree#testProcessTree() doesn't wait long enough for the process to die. (kkambatl via tucu) - YARN-470. Support a way to disable resource monitoring on the NodeManager. - (Siddharth Seth via hitesh) - YARN-71. Fix the NodeManager to clean up local-dirs on restart. (Xuan Gong via sseth) @@ -209,6 +206,9 @@ Release 2.0.4-alpha - UNRELEASED YARN-429. capacity-scheduler config missing from yarn-test artifact. (sseth via hitesh) + YARN-470. Support a way to disable resource monitoring on the NodeManager. + (Siddharth Seth via hitesh) + Release 2.0.3-alpha - 2013-02-06 INCOMPATIBLE CHANGES