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 ma...@apache.org on 2012/05/07 07:57:21 UTC
svn commit: r1334877 - in /hadoop/common/branches/branch-1.0: CHANGES.txt
src/examples/org/apache/hadoop/examples/Grep.java
Author: mattf
Date: Mon May 7 05:57:21 2012
New Revision: 1334877
URL: http://svn.apache.org/viewvc?rev=1334877&view=rev
Log:
MAPREDUCE-3857. Grep example ignores mapred.job.queue.name. Contributed by Jonathan Eagles.
Modified:
hadoop/common/branches/branch-1.0/CHANGES.txt
hadoop/common/branches/branch-1.0/src/examples/org/apache/hadoop/examples/Grep.java
Modified: hadoop/common/branches/branch-1.0/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1.0/CHANGES.txt?rev=1334877&r1=1334876&r2=1334877&view=diff
==============================================================================
--- hadoop/common/branches/branch-1.0/CHANGES.txt (original)
+++ hadoop/common/branches/branch-1.0/CHANGES.txt Mon May 7 05:57:21 2012
@@ -77,6 +77,9 @@ Release 1.0.3 - unreleased
HDFS-3374. hdfs' TestDelegationToken fails intermittently with a race
condition. (Owen O'Malley via mattf)
+ MAPREDUCE-3857. Grep example ignores mapred.job.queue.name.
+ (Jonathan Eagles via mattf)
+
Release 1.0.2 - 2012.03.24
NEW FEATURES
Modified: hadoop/common/branches/branch-1.0/src/examples/org/apache/hadoop/examples/Grep.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1.0/src/examples/org/apache/hadoop/examples/Grep.java?rev=1334877&r1=1334876&r2=1334877&view=diff
==============================================================================
--- hadoop/common/branches/branch-1.0/src/examples/org/apache/hadoop/examples/Grep.java (original)
+++ hadoop/common/branches/branch-1.0/src/examples/org/apache/hadoop/examples/Grep.java Mon May 7 05:57:21 2012
@@ -68,7 +68,7 @@ public class Grep extends Configured imp
JobClient.runJob(grepJob);
- JobConf sortJob = new JobConf(Grep.class);
+ JobConf sortJob = new JobConf(getConf(), Grep.class);
sortJob.setJobName("grep-sort");
FileInputFormat.setInputPaths(sortJob, tempDir);