Return-Path: 
 <common-commits-return-18223-apmail-hadoop-common-commits-archive=hadoop.apache.org@hadoop.apache.org>
X-Original-To: apmail-hadoop-common-commits-archive@www.apache.org
Delivered-To: apmail-hadoop-common-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id B001F91FD
	for <apmail-hadoop-common-commits-archive@www.apache.org>;
 Thu, 21 Jun 2012 15:03:20 +0000 (UTC)
Received: (qmail 4915 invoked by uid 500); 21 Jun 2012 15:03:20 -0000
Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org
Received: (qmail 4744 invoked by uid 500); 21 Jun 2012 15:03:20 -0000
Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:common-commits-help@hadoop.apache.org>
List-Unsubscribe: <mailto:common-commits-unsubscribe@hadoop.apache.org>
List-Post: <mailto:common-commits@hadoop.apache.org>
List-Id: <common-commits.hadoop.apache.org>
Reply-To: common-dev@hadoop.apache.org
Delivered-To: mailing list common-commits@hadoop.apache.org
Received: (qmail 4735 invoked by uid 99); 21 Jun 2012 15:03:20 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 21 Jun 2012 15:03:20 +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:03:19 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id 313862388980
	for <common-commits@hadoop.apache.org>; Thu, 21 Jun 2012 15:02:59 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1352552 -
 /hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-gridmix/pom.xml
Date: Thu, 21 Jun 2012 15:02:59 -0000
To: common-commits@hadoop.apache.org
From: tgraves@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20120621150259.313862388980@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: tgraves
Date: Thu Jun 21 15:02:58 2012
New Revision: 1352552

URL: http://svn.apache.org/viewvc?rev=1352552&view=rev
Log:
merge -r 1352550:1352551 from branch-2. FIXES: MAPREDUCE-4320

Modified:
    hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-gridmix/pom.xml

Modified: hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-gridmix/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-gridmix/pom.xml?rev=1352552&r1=1352551&r2=1352552&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-gridmix/pom.xml (original)
+++ hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-gridmix/pom.xml Thu Jun 21 15:02:58 2012
@@ -121,7 +121,7 @@
          <configuration>
           <archive>
            <manifest>
-            <mainClass>org.apache.hadoop.tools.HadoopArchives</mainClass>
+            <mainClass>org.apache.hadoop.mapred.gridmix.Gridmix</mainClass>
            </manifest>
          </archive>
         </configuration>