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 1620E10E25 for ; Thu, 6 Feb 2014 19:08:40 +0000 (UTC) Received: (qmail 82895 invoked by uid 500); 6 Feb 2014 19:08:36 -0000 Delivered-To: apmail-hadoop-mapreduce-commits-archive@hadoop.apache.org Received: (qmail 82814 invoked by uid 500); 6 Feb 2014 19:08:34 -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 82752 invoked by uid 99); 6 Feb 2014 19:08:33 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 06 Feb 2014 19:08:33 +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, 06 Feb 2014 19:08:31 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 6240C23889CB; Thu, 6 Feb 2014 19:08:10 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1565402 - /hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt Date: Thu, 06 Feb 2014 19:08:10 -0000 To: mapreduce-commits@hadoop.apache.org From: vinodkv@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140206190810.6240C23889CB@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: vinodkv Date: Thu Feb 6 19:08:09 2014 New Revision: 1565402 URL: http://svn.apache.org/r1565402 Log: MAPREDUCE-5743. Fixed CHANGES.txt to give credit to Ted too. svn merge --ignore-ancestry -c 1565401 ../../trunk/ 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=1565402&r1=1565401&r2=1565402&view=diff ============================================================================== --- hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt (original) +++ hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt Thu Feb 6 19:08:09 2014 @@ -211,7 +211,7 @@ Release 2.3.0 - UNRELEASED (Mohammad Kamrul Islam via kasha) MAPREDUCE-5743. Fixed the test failure in TestRMContainerAllocator. - (Vinod Kumar Vavilapalli via zjshen) + (Ted Yu and Vinod Kumar Vavilapalli via zjshen) Release 2.2.0 - 2013-10-13