merge -r 1352549:1352550 from trunk. FIXES: MAPREDUCE-4320

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1352551 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Thomas Graves 2012-06-21 15:02:16 +00:00
parent f63255faec
commit 2d734774a1
2 changed files with 3 additions and 1 deletions

View File

@ -480,6 +480,8 @@ Release 0.23.3 - UNRELEASED
MAPREDUCE-3889. job client tries to use /tasklog interface, but that MAPREDUCE-3889. job client tries to use /tasklog interface, but that
doesn't exist anymore (Devaraj K via bobby) doesn't exist anymore (Devaraj K via bobby)
MAPREDUCE-4320. gridmix mainClass wrong in pom.xml (tgraves)
Release 0.23.2 - UNRELEASED Release 0.23.2 - UNRELEASED
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

View File

@ -121,7 +121,7 @@
<configuration> <configuration>
<archive> <archive>
<manifest> <manifest>
<mainClass>org.apache.hadoop.tools.HadoopArchives</mainClass> <mainClass>org.apache.hadoop.mapred.gridmix.Gridmix</mainClass>
</manifest> </manifest>
</archive> </archive>
</configuration> </configuration>