hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jl...@apache.org
Subject svn commit: r1391274 - in /hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common: CHANGES.txt src/main/java/org/apache/hadoop/util/GenericOptionsParser.java
Date Fri, 28 Sep 2012 00:28:06 GMT
Author: jlowe
Date: Fri Sep 28 00:28:06 2012
New Revision: 1391274

URL: http://svn.apache.org/viewvc?rev=1391274&view=rev
Log:
svn merge -c 1302598 FIXES: HADOOP-8183. Stop using mapred.used.genericoptions.parser (harsh)

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=1391274&r1=1391273&r2=1391274&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 Fri
Sep 28 00:28:06 2012
@@ -20,6 +20,8 @@ Release 0.23.4 - UNRELEASED
     HADOOP-8684. Deadlock between WritableComparator and WritableComparable.
     (Jing Zhao via suresh)
 
+    HADOOP-8183. Stop using "mapred.used.genericoptions.parser" (harsh)
+
 Release 0.23.3 - UNRELEASED
 
   INCOMPATIBLE CHANGES

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=1391274&r1=1391273&r2=1391274&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
Fri Sep 28 00:28:06 2012
@@ -309,7 +309,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