hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ha...@apache.org
Subject svn commit: r1302626 - in /hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common: CHANGES.txt src/main/java/org/apache/hadoop/util/GenericOptionsParser.java
Date Mon, 19 Mar 2012 19:55:02 GMT
Author: harsh
Date: Mon Mar 19 19:55:02 2012
New Revision: 1302626

URL: http://svn.apache.org/viewvc?rev=1302626&view=rev
Log:
svn merge -c 1302598. Merge HADOOP-8183 into branch-0.23 from trunk.

Modified:
    hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt
    hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/GenericOptionsParser.java

Modified: hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1302626&r1=1302625&r2=1302626&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt (original)
+++ hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt Mon
Mar 19 19:55:02 2012
@@ -91,6 +91,8 @@ Release 0.23.3 - UNRELEASED
     HADOOP-6941. Adds support for building Hadoop with IBM's JDK 
     (Stephen Watt, Eli and ddas)
 
+    HADOOP-8183. Stop using "mapred.used.genericoptions.parser" (harsh)
+
   OPTIMIZATIONS
 
   BUG FIXES

Modified: hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/GenericOptionsParser.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/GenericOptionsParser.java?rev=1302626&r1=1302625&r2=1302626&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/GenericOptionsParser.java
(original)
+++ hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/GenericOptionsParser.java
Mon Mar 19 19:55:02 2012
@@ -305,7 +305,7 @@ public class GenericOptionsParser {
         }
       }
     }
-    conf.setBoolean("mapred.used.genericoptionsparser", true);
+    conf.setBoolean("mapreduce.client.genericoptionsparser.used", true);
     
     // tokensFile
     if(line.hasOption("tokenCacheFile")) {



Mime
View raw message