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 80CF491F7 for ; Thu, 21 Jun 2012 15:02:40 +0000 (UTC) Received: (qmail 1964 invoked by uid 500); 21 Jun 2012 15:02:40 -0000 Delivered-To: apmail-hadoop-mapreduce-commits-archive@hadoop.apache.org Received: (qmail 1893 invoked by uid 500); 21 Jun 2012 15:02:40 -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 1885 invoked by uid 99); 21 Jun 2012 15:02:40 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 21 Jun 2012 15:02:40 +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, 21 Jun 2012 15:02:38 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 69FAA2388865; Thu, 21 Jun 2012 15:02:17 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1352551 - /hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt Date: Thu, 21 Jun 2012 15:02:17 -0000 To: mapreduce-commits@hadoop.apache.org From: tgraves@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120621150217.69FAA2388865@eris.apache.org> Author: tgraves Date: Thu Jun 21 15:02:16 2012 New Revision: 1352551 URL: http://svn.apache.org/viewvc?rev=1352551&view=rev Log: merge -r 1352549:1352550 from trunk. FIXES: MAPREDUCE-4320 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=1352551&r1=1352550&r2=1352551&view=diff ============================================================================== --- hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt (original) +++ hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt Thu Jun 21 15:02:16 2012 @@ -480,6 +480,8 @@ Release 0.23.3 - UNRELEASED MAPREDUCE-3889. job client tries to use /tasklog interface, but that doesn't exist anymore (Devaraj K via bobby) + MAPREDUCE-4320. gridmix mainClass wrong in pom.xml (tgraves) + Release 0.23.2 - UNRELEASED INCOMPATIBLE CHANGES