You are viewing a plain text version of this content. The canonical link for it is here.

Posted to mapreduce-commits@hadoop.apache.org by ac...@apache.org on 2011/12/28 19:25:13 UTC

svn commit: r1225261 - /hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt

Author: acmurthy
Date: Wed Dec 28 18:25:13 2011
New Revision: 1225261

URL: http://svn.apache.org/viewvc?rev=1225261&view=rev
Log:
Merge -c 1225259 from trunk to branch-0.23 to fix MAPREDUCE-3604.

Modified:
    hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt

Modified: hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt?rev=1225261&r1=1225260&r2=1225261&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt (original)
+++ hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt Wed Dec 28 18:25:13 2011
@@ -315,7 +315,9 @@ Release 0.23.1 - Unreleased
     MAPREDUCE-3586. Modified CompositeService to avoid duplicate stop operations
     thereby solving race conditions in MR AM shutdown. (vinodkv)
 
->>>>>>> .merge-right.r1221950
+    MAPREDUCE-3604. Fixed streaming to use new mapreduce.framework.name to
+    check for local mode. (acmurthy) 
+
 Release 0.23.0 - 2011-11-01 
 
   INCOMPATIBLE CHANGES