Author: tgraves Date: Tue Jul 31 19:22:25 2012 New Revision: 1367717 URL: http://svn.apache.org/viewvc?rev=1367717&view=rev Log: merge -r 1367714:1367715 from branch-2. FIXES: MAPREDUCE-4493
Modified: hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/StreamJob.java Modified: hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/StreamJob.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/StreamJob.java?rev=1367717&r1=1367716&r2=1367717&view=diff ============================================================================== --- hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/StreamJob.java (original) +++ hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/StreamJob.java Tue Jul 31 19:22:25 2012 @@ -958,7 +958,6 @@ public class StreamJob implements Tool { if (!b) fail(LINK_URI); } - DistributedCache.createSymlink(jobConf_); // set the jobconf for the caching parameters if (cacheArchives != null) DistributedCache.setCacheArchives(archiveURIs, jobConf_);