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

hadoop-mapreduce-project/CHANGES.txt

@@ -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

hadoop-tools/hadoop-gridmix/pom.xml

@@ -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>