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:59:41 UTC
svn commit: r1334878 - in /hadoop/common/branches/branch-1: ./ CHANGES.txt
src/examples/org/apache/hadoop/examples/Grep.java src/mapred/
Author: mattf
Date: Mon May 7 05:59:40 2012
New Revision: 1334878
URL: http://svn.apache.org/viewvc?rev=1334878&view=rev
Log:
MAPREDUCE-3857. Grep example ignores mapred.job.queue.name. Contributed by Jonathan Eagles.
Modified:
hadoop/common/branches/branch-1/ (props changed)
hadoop/common/branches/branch-1/CHANGES.txt (contents, props changed)
hadoop/common/branches/branch-1/src/examples/org/apache/hadoop/examples/Grep.java
hadoop/common/branches/branch-1/src/mapred/ (props changed)
Propchange: hadoop/common/branches/branch-1/
------------------------------------------------------------------------------
Merged /hadoop/common/branches/branch-1.0:r1334877
Modified: hadoop/common/branches/branch-1/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/CHANGES.txt?rev=1334878&r1=1334877&r2=1334878&view=diff
==============================================================================
--- hadoop/common/branches/branch-1/CHANGES.txt (original)
+++ hadoop/common/branches/branch-1/CHANGES.txt Mon May 7 05:59:40 2012
@@ -317,6 +317,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
Propchange: hadoop/common/branches/branch-1/CHANGES.txt
------------------------------------------------------------------------------
Merged /hadoop/common/branches/branch-1.0/CHANGES.txt:r1334877
Modified: hadoop/common/branches/branch-1/src/examples/org/apache/hadoop/examples/Grep.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/src/examples/org/apache/hadoop/examples/Grep.java?rev=1334878&r1=1334877&r2=1334878&view=diff
==============================================================================
--- hadoop/common/branches/branch-1/src/examples/org/apache/hadoop/examples/Grep.java (original)
+++ hadoop/common/branches/branch-1/src/examples/org/apache/hadoop/examples/Grep.java Mon May 7 05:59:40 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);
Propchange: hadoop/common/branches/branch-1/src/mapred/
------------------------------------------------------------------------------
Merged /hadoop/common/branches/branch-1.0/src/mapred:r1334877