Return-Path: X-Original-To: apmail-hadoop-mapreduce-commits-archive@minotaur.apache.org Delivered-To: apmail-hadoop-mapreduce-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 C727A10B73 for ; Thu, 1 Aug 2013 23:55:51 +0000 (UTC) Received: (qmail 32439 invoked by uid 500); 1 Aug 2013 23:55:51 -0000 Delivered-To: apmail-hadoop-mapreduce-commits-archive@hadoop.apache.org Received: (qmail 32386 invoked by uid 500); 1 Aug 2013 23:55:51 -0000 Mailing-List: contact mapreduce-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: mapreduce-dev@hadoop.apache.org Delivered-To: mailing list mapreduce-commits@hadoop.apache.org Received: (qmail 32376 invoked by uid 99); 1 Aug 2013 23:55:51 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 01 Aug 2013 23:55: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, 01 Aug 2013 23:55:50 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 9FDE22388A91; Thu, 1 Aug 2013 23:55:30 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1509476 - /hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt Date: Thu, 01 Aug 2013 23:55:30 -0000 To: mapreduce-commits@hadoop.apache.org From: jlowe@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20130801235530.9FDE22388A91@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: jlowe Date: Thu Aug 1 23:55:30 2013 New Revision: 1509476 URL: http://svn.apache.org/r1509476 Log: svn merge -c 1509475 FIXES: Correct fix versions for MAPREDUCE-5428 and YARN-573. Modified: hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt Modified: hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt?rev=1509476&r1=1509475&r2=1509476&view=diff ============================================================================== --- hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt (original) +++ hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt Thu Aug 1 23:55:30 2013 @@ -66,6 +66,9 @@ Release 2.1.1-beta - UNRELEASED MAPREDUCE-5385. Fixed a bug with JobContext getCacheFiles API. (Omkar Vinit Joshi via vinodkv) + MAPREDUCE-5428. HistoryFileManager doesn't stop threads when service is + stopped (Karthik Kambatla via jlowe) + Release 2.1.0-beta - 2013-08-06 INCOMPATIBLE CHANGES @@ -499,9 +502,6 @@ Release 2.1.0-beta - 2013-08-06 MAPREDUCE-5419. TestSlive is getting FileNotFound Exception (Robert Parker via jlowe) - MAPREDUCE-5428. HistoryFileManager doesn't stop threads when service is - stopped (Karthik Kambatla via jlowe) - BREAKDOWN OF HADOOP-8562 SUBTASKS MAPREDUCE-4739. Some MapReduce tests fail to find winutils.