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 D6A5C10562 for ; Thu, 3 Apr 2014 00:57:27 +0000 (UTC) Received: (qmail 27201 invoked by uid 500); 3 Apr 2014 00:57:25 -0000 Delivered-To: apmail-hadoop-mapreduce-commits-archive@hadoop.apache.org Received: (qmail 27078 invoked by uid 500); 3 Apr 2014 00:57:25 -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 27070 invoked by uid 99); 3 Apr 2014 00:57:25 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 03 Apr 2014 00:57:25 +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, 03 Apr 2014 00:57:22 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 8688123889F1; Thu, 3 Apr 2014 00:57:00 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1584234 - /hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt Date: Thu, 03 Apr 2014 00:57:00 -0000 To: mapreduce-commits@hadoop.apache.org From: atm@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140403005700.8688123889F1@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: atm Date: Thu Apr 3 00:57:00 2014 New Revision: 1584234 URL: http://svn.apache.org/r1584234 Log: Move MAPREDUCE-5014 to the right section now that it's been merged to branch-2. Modified: hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt Modified: hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt?rev=1584234&r1=1584233&r2=1584234&view=diff ============================================================================== --- hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt (original) +++ hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt Thu Apr 3 00:57:00 2014 @@ -68,9 +68,6 @@ Trunk (Unreleased) MAPREDUCE-4735. Make arguments in TestDFSIO case insensitive. (Brandon Li via suresh) - MAPREDUCE-5014. Extend Distcp to accept a custom CopyListing. - (Srikanth Sundarrajan via amareshwari) - MAPREDUCE-5197. Add a service for checkpointing task state. (Carlo Curino via cdouglas) @@ -169,6 +166,9 @@ Release 2.5.0 - UNRELEASED MAPREDUCE-5759. Remove unnecessary conf load in Limits (Sandy Ryza) + MAPREDUCE-5014. Extend Distcp to accept a custom CopyListing. + (Srikanth Sundarrajan via amareshwari) + Release 2.4.1 - UNRELEASED INCOMPATIBLE CHANGES