Author: jlowe
Date: Fri Dec 21 23:12:44 2012
New Revision: 1425181
URL: http://svn.apache.org/viewvc?rev=1425181&view=rev
Log:
svn merge -c 1425177 FIXES: MAPREDUCE-4793. Problem with adding resources when
using both -files and -file to hadoop streaming. Contributed by Jason Lowe
Modified:
hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt
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=1425181&r1=1425180&r2=1425181&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt
(original)
+++ hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt Fri
Dec 21 23:12:44 2012
@@ -481,6 +481,9 @@ Release 0.23.6 - UNRELEASED
MAPREDUCE-4833. Task can get stuck in FAIL_CONTAINER_CLEANUP (Robert
Parker via jlowe)
+ MAPREDUCE-4793. Problem with adding resources when using both -files and
+ -file to hadoop streaming (jlowe)
+
Release 0.23.5 - UNRELEASED
INCOMPATIBLE CHANGES
