Author: vinodkv
Date: Wed Apr 10 01:31:44 2013
New Revision: 1466310
URL: http://svn.apache.org/r1466310
Log:
MAPREDUCE-5006. Fix failing streaming tests due to MAPREDUCE-4994. Contributed
by Sandy Ryza.
svn merge --ignore-ancestry -c 1461541 ../../trunk/
Modified:
hadoop/common/branches/branch-2.0.4-alpha/hadoop-mapreduce-project/CHANGES.txt
hadoop/common/branches/branch-2.0.4-alpha/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapred/LocalClientProtocolProvider.java
Modified:
hadoop/common/branches/branch-2.0.4-alpha/hadoop-mapreduce-project/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.0.4-alpha/hadoop-mapreduce-project/CHANGES.txt?rev=1466310&r1=1466309&r2=1466310&view=diff
==============================================================================
---
hadoop/common/branches/branch-2.0.4-alpha/hadoop-mapreduce-project/CHANGES.txt
(original)
+++
hadoop/common/branches/branch-2.0.4-alpha/hadoop-mapreduce-project/CHANGES.txt
Wed Apr 10 01:31:44 2013
@@ -22,6 +22,9 @@ Release 2.0.4-beta - UNRELEASED
MAPREDUCE-5083. MiniMRCluster should use a random component when creating
an
actual cluster (Siddharth Seth via hitesh)
+ MAPREDUCE-5006. Fix failing streaming tests due to MAPREDUCE-4994.
+ (Sandy Ryza via tomwhite)
+
Release 2.0.3-alpha - 2013-02-06
INCOMPATIBLE CHANGES
Modified:
hadoop/common/branches/branch-2.0.4-alpha/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapred/LocalClientProtocolProvider.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.0.4-alpha/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapred/LocalClientProtocolProvider.java?rev=1466310&r1=1466309&r2=1466310&view=diff
==============================================================================
---
hadoop/common/branches/branch-2.0.4-alpha/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapred/LocalClientProtocolProvider.java
(original)
+++
hadoop/common/branches/branch-2.0.4-alpha/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapred/LocalClientProtocolProvider.java
Wed Apr 10 01:31:44 2013
@@ -37,9 +37,7 @@ public class LocalClientProtocolProvider
if (!MRConfig.LOCAL_FRAMEWORK_NAME.equals(framework)) {
return null;
}
- if (conf.get("mapreduce.job.maps") == null) {
- conf.setInt("mapreduce.job.maps", 1);
- }
+ conf.setInt(JobContext.NUM_MAPS, 1);
return new LocalJobRunner(conf);
}
