svn merge -c 1174471 from branch-0.20-security for MAPREDUCE-3076. Contributed by acmurthy

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

CHANGES.txt

@@ -178,6 +178,9 @@ Release 0.20.205.0 - 2011.09.12
     HADOOP-7658. Fix hadoop config template for secured and unsecured
     installation (Eric Yang via gkesavan)
 
+    MAPREDUCE-3076. Annotate o.a.h.mapreduce.TestSleepJob with @Ignore since it
+    is not a junit test.  (acmurthy via szetszwo)
+
   IMPROVEMENTS
 
     HADOOP-7655. provide a small validation script that smoke tests the installed

src/test/org/apache/hadoop/mapreduce/TestSleepJob.java

@@ -17,6 +17,8 @@
  */
 package org.apache.hadoop.mapreduce;
 
+import org.junit.Ignore;
+
 import java.io.IOException;
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -41,6 +43,7 @@ import org.apache.hadoop.util.ToolRunner;
  * of <code>numMappers * mapSleepTime / 100</code>, so the job uses
  * some disk space.
  */
+@Ignore
 public class TestSleepJob extends Configured implements Tool {
   public static String MAP_SLEEP_COUNT = "mapreduce.sleepjob.map.sleep.count";
   public static String REDUCE_SLEEP_COUNT =