浏览代码

Merge -c 1189587 from trunk to branch-0.23 to fix MAPREDUCE-3254.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1189588 13f79535-47bb-0310-9956-ffa450edef68
Arun Murthy 13 年之前
父节点
当前提交
3e04036dbe

+ 3 - 0
hadoop-mapreduce-project/CHANGES.txt

@@ -1725,6 +1725,9 @@ Release 0.23.0 - Unreleased
     MAPREDUCE-3250. When AM restarts, client keeps reconnecting to the new AM 
     and prints a lots of logs. (vinodkv via mahadev)
 
+    MAPREDUCE-3254. Fixed streaming to set the job.jar by using the right
+    JobConf ctor. (acmurthy) 
+
 Release 0.22.0 - Unreleased
 
   INCOMPATIBLE CHANGES

+ 1 - 1
hadoop-mapreduce-project/src/contrib/streaming/src/java/org/apache/hadoop/streaming/StreamJob.java

@@ -718,7 +718,7 @@ public class StreamJob implements Tool {
     }
 
     // general MapRed job properties
-    jobConf_ = new JobConf(config_);
+    jobConf_ = new JobConf(config_, StreamJob.class);
     
     // All streaming jobs get the task timeout value
     // from the configuration settings.