svn commit: r1346287 - in /hadoop/common/branches/branch-0.22/mapreduce: CHANGES.txt src/contrib/streaming/src/test/org/apache/hadoop/streaming/TestFileArgs.java

[shv]

Author: shv
Date: Tue Jun  5 08:28:17 2012
New Revision: 1346287

URL: http://svn.apache.org/viewvc?rev=1346287&view=rev
Log:
MAPREDUCE-4249. Fix streaming test TestFileArgs. Contributed by Benoy Antony.

Modified:
    hadoop/common/branches/branch-0.22/mapreduce/CHANGES.txt
    
hadoop/common/branches/branch-0.22/mapreduce/src/contrib/streaming/src/test/org/apache/hadoop/streaming/TestFileArgs.java

Modified: hadoop/common/branches/branch-0.22/mapreduce/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.22/mapreduce/CHANGES.txt?rev=1346287&r1=1346286&r2=1346287&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.22/mapreduce/CHANGES.txt (original)
+++ hadoop/common/branches/branch-0.22/mapreduce/CHANGES.txt Tue Jun  5 
08:28:17 2012
@@ -71,6 +71,10 @@ Release 0.22.1 - Unreleased
 
     MAPREDUCE-4248. Fix TestRecoveryManager. (Benoy Antony via shv)
 
+    MAPREDUCE-4248. Fix TestRecoveryManager. (Benoy Antony via shv)
+
+    MAPREDUCE-4249. Fix streaming test TestFileArgs. (Benoy Antony via shv)
+
 Release 0.22.0 - 2011-11-29
 
   INCOMPATIBLE CHANGES

Modified: 
hadoop/common/branches/branch-0.22/mapreduce/src/contrib/streaming/src/test/org/apache/hadoop/streaming/TestFileArgs.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.22/mapreduce/src/contrib/streaming/src/test/org/apache/hadoop/streaming/TestFileArgs.java?rev=1346287&r1=1346286&r2=1346287&view=diff
==============================================================================
--- 
hadoop/common/branches/branch-0.22/mapreduce/src/contrib/streaming/src/test/org/apache/hadoop/streaming/TestFileArgs.java
 (original)
+++ 
hadoop/common/branches/branch-0.22/mapreduce/src/contrib/streaming/src/test/org/apache/hadoop/streaming/TestFileArgs.java
 Tue Jun  5 08:28:17 2012
@@ -45,7 +45,7 @@ public class TestFileArgs extends TestSt
   private Configuration conf = null;
 
   private static final String EXPECTED_OUTPUT =
-    "job.jar\t\nsidefile\t\ntmp\t\n";
+    "job.jar\t\norg\t\nsidefile\t\ntmp\t\n";
 
   private static final String LS_PATH = "/bin/ls";