You are viewing a plain text version of this content. The canonical link for it is here.

Posted to common-commits@hadoop.apache.org by tg...@apache.org on 2012/05/21 03:58:45 UTC

svn commit: r1340882 - /hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/StressJobFactory.java

Author: tgraves
Date: Mon May 21 01:58:44 2012
New Revision: 1340882

URL: http://svn.apache.org/viewvc?rev=1340882&view=rev
Log:
merge -r 1340880:1340881 from branch-2. FIXES: MAPREDUCE-4269

Modified:
    hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/StressJobFactory.java

Modified: hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/StressJobFactory.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/StressJobFactory.java?rev=1340882&r1=1340881&r2=1340882&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/StressJobFactory.java (original)
+++ hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/StressJobFactory.java Mon May 21 01:58:44 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(