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 sz...@apache.org on 2011/09/23 03:04:23 UTC
svn commit: r1174474 - in /hadoop/common/branches/branch-0.20-security-205:
./ CHANGES.txt src/test/org/apache/hadoop/mapreduce/TestSleepJob.java
Author: szetszwo
Date: Fri Sep 23 01:04:23 2011
New Revision: 1174474
URL: http://svn.apache.org/viewvc?rev=1174474&view=rev
Log:
svn merge -c 1174471 from branch-0.20-security for MAPREDUCE-3076. Contributed by acmurthy
Modified:
hadoop/common/branches/branch-0.20-security-205/ (props changed)
hadoop/common/branches/branch-0.20-security-205/CHANGES.txt (contents, props changed)
hadoop/common/branches/branch-0.20-security-205/src/test/org/apache/hadoop/mapreduce/TestSleepJob.java
Propchange: hadoop/common/branches/branch-0.20-security-205/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep 23 01:04:23 2011
@@ -1,6 +1,6 @@
/hadoop/common/branches/branch-0.20:826138,826568,829987,831184,833001,880632,898713,909245,909723,960946,990003,1044225
/hadoop/common/branches/branch-0.20-append:955380,955398,955448,956329
-/hadoop/common/branches/branch-0.20-security:1170042,1171891,1171905,1172184,1172188,1172190,1172192
+/hadoop/common/branches/branch-0.20-security:1170042,1171891,1171905,1172184,1172188,1172190,1172192,1174471
/hadoop/common/branches/branch-0.20-security-203:1096071,1097011,1097249,1097269,1097281,1097966,1098816,1098819,1098823,1098827,1098832,1098839,1098854,1098863,1099088,1099191,1099324,1099330,1099333,1102071,1128115
/hadoop/common/branches/branch-0.20-security-204:1128390,1147228,1148069,1149316,1154413
/hadoop/core/branches/branch-0.19:713112
Modified: hadoop/common/branches/branch-0.20-security-205/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-205/CHANGES.txt?rev=1174474&r1=1174473&r2=1174474&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-205/CHANGES.txt (original)
+++ hadoop/common/branches/branch-0.20-security-205/CHANGES.txt Fri Sep 23 01:04:23 2011
@@ -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
Propchange: hadoop/common/branches/branch-0.20-security-205/CHANGES.txt
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep 23 01:04:23 2011
@@ -1,6 +1,6 @@
/hadoop/common/branches/branch-0.20/CHANGES.txt:826138,826568,829987,831184,833001,880632,898713,909245,909723,960946,990003,1044225
/hadoop/common/branches/branch-0.20-append/CHANGES.txt:955380,955398,955448,956329
-/hadoop/common/branches/branch-0.20-security/CHANGES.txt:1170042,1171181,1171891,1171905,1172184,1172188,1172190,1172192,1173843,1174326
+/hadoop/common/branches/branch-0.20-security/CHANGES.txt:1170042,1171181,1171891,1171905,1172184,1172188,1172190,1172192,1173843,1174326,1174471
/hadoop/common/branches/branch-0.20-security-203/CHANGES.txt:1096071,1097011,1097249,1097269,1097281,1097966,1098816,1098819,1098823,1098827,1098832,1098839,1098854,1098863,1099088,1099191,1099324,1099330,1099333,1102071,1128115
/hadoop/common/branches/branch-0.20-security-204/CHANGES.txt:1128390,1147228,1148069,1149316,1152887,1154413,1159730,1161741
/hadoop/core/branches/branch-0.18/CHANGES.txt:727226
Modified: hadoop/common/branches/branch-0.20-security-205/src/test/org/apache/hadoop/mapreduce/TestSleepJob.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-205/src/test/org/apache/hadoop/mapreduce/TestSleepJob.java?rev=1174474&r1=1174473&r2=1174474&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-205/src/test/org/apache/hadoop/mapreduce/TestSleepJob.java (original)
+++ hadoop/common/branches/branch-0.20-security-205/src/test/org/apache/hadoop/mapreduce/TestSleepJob.java Fri Sep 23 01:04:23 2011
@@ -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 =