merge -r 1340879:1340880 from trunk. FIXES: MAPREDUCE-4269

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1340881 13f79535-47bb-0310-9956-ffa450edef68

hadoop-mapreduce-project/CHANGES.txt

@@ -404,6 +404,9 @@ Release 0.23.3 - UNRELEASED
     MAPREDUCE-4197. Include the hsqldb jar in the hadoop-mapreduce tar 
     file (Ravi Prakash via tgraves)
 
+    MAPREDUCE-4269. documentation: Gridmix has javadoc warnings in 
+    StressJobFactory (Jonathon Eagles via tgraves).
+
 Release 0.23.2 - UNRELEASED
 
   INCOMPATIBLE CHANGES

hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/StressJobFactory.java

@@ -254,8 +254,6 @@ public class StressJobFactory extends JobFactory<Statistics.ClusterStats> {
   /**
    * We try to use some light-weight mechanism to determine cluster load.
    *
-   * @param stats
-   * @param clusterStatus Cluster status
    * @throws java.io.IOException
    */
   private void checkLoadAndGetSlotsToBackfill(