Merge -r 725978:725979 from trunk onto 0.18 branch. Fixes HADOOP-4857.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/core/branches/branch-0.18@725980 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -102,6 +102,9 @@ Release 0.18.3 - Unreleased
     HADOOP-4620. Fixes Streaming to handle well the cases of map/reduce with empty
     input/output. (Ravi Gummadi via ddas)
 
+    HADOOP-4857. Fixes TestUlimit to have exactly 1 map in the jobs spawned.
+    (Ravi Gummadi via ddas)
+
 Release 0.18.2 - 2008-11-03
 
   BUG FIXES

src/contrib/streaming/src/test/org/apache/hadoop/streaming/TestUlimit.java

@@ -57,6 +57,7 @@ public class TestUlimit extends TestCase {
       "-mapper", map,
       "-reducer", "org.apache.hadoop.mapred.lib.IdentityReducer",
       "-numReduceTasks", "0",
+      "-jobconf", "mapred.map.tasks=1",
       "-jobconf", "mapred.child.ulimit=" + memLimit,
       "-jobconf", "mapred.job.tracker=" + "localhost:" +
                                            mr.getJobTrackerPort(),