Author: tgraves Date: Mon May 21 01:57:21 2012 New Revision: 1340881 URL: http://svn.apache.org/viewvc?rev=1340881&view=rev Log: merge -r 1340879:1340880 from trunk. FIXES: MAPREDUCE-4269
Modified: hadoop/common/branches/branch-2/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/StressJobFactory.java Modified: hadoop/common/branches/branch-2/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/StressJobFactory.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/StressJobFactory.java?rev=1340881&r1=1340880&r2=1340881&view=diff ============================================================================== --- hadoop/common/branches/branch-2/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/StressJobFactory.java (original) +++ hadoop/common/branches/branch-2/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/StressJobFactory.java Mon May 21 01:57:21 2012 @@ -254,8 +254,6 @@ public class StressJobFactory extends Jo /** * 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(