Author: vinodkv
Date: Mon Jul 7 19:46:31 2014
New Revision: 1608580
URL: http://svn.apache.org/r1608580
Log:
MAPREDUCE-5868. Fixed an issue with TestPipeApplication that was causing the
nightly builds to fail. Contributed by Akira Ajisaka.
svn merge --ignore-ancestry -c 1608579 ../../trunk/
Modified:
hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/pipes/TestPipeApplication.java
Modified: hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt?rev=1608580&r1=1608579&r2=1608580&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt
(original)
+++ hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt Mon
Jul 7 19:46:31 2014
@@ -146,6 +146,9 @@ Release 2.5.0 - UNRELEASED
MAPREDUCE-5900. Changed to the interpret container preemption exit code as
a
task attempt killing event. (Mayank Bansal via zjshen)
+ MAPREDUCE-5868. Fixed an issue with TestPipeApplication that was causing
the
+ nightly builds to fail. (Akira Ajisaka via vinodkv)
+
Release 2.4.1 - 2014-06-23
INCOMPATIBLE CHANGES
Modified:
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/pipes/TestPipeApplication.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/pipes/TestPipeApplication.java?rev=1608580&r1=1608579&r2=1608580&view=diff
==============================================================================
---
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/pipes/TestPipeApplication.java
(original)
+++
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/pipes/TestPipeApplication.java
Mon Jul 7 19:46:31 2014
@@ -183,6 +183,8 @@ public class TestPipeApplication {
output.setWriter(wr);
conf.set(Submitter.PRESERVE_COMMANDFILE, "true");
+ initStdOut(conf);
+
Application<WritableComparable<IntWritable>, Writable, IntWritable,
Text> application = new Application<WritableComparable<IntWritable>, Writable,
IntWritable, Text>(
conf, rReader, output, reporter, IntWritable.class, Text.class);
application.getDownlink().flush();
