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-tools/hadoop-gridmix/pom.xml Modified: hadoop/common/branches/branch-2/hadoop-tools/hadoop-gridmix/pom.xml URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-tools/hadoop-gridmix/pom.xml?rev=1352551&r1=1352550&r2=1352551&view=diff ============================================================================== --- hadoop/common/branches/branch-2/hadoop-tools/hadoop-gridmix/pom.xml (original) +++ hadoop/common/branches/branch-2/hadoop-tools/hadoop-gridmix/pom.xml Thu Jun 21 15:02:16 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>