Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

svn merge -c 1302598. Merge HADOOP-8183 into branch-0.23 from trunk. 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1302626 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Harsh J 2012-03-19 19:55:02 +00:00
parent 09a03eaef0
commit 84738bcd39
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hadoop-common-project/hadoop-common/CHANGES.txt
View File

@ -91,6 +91,8 @@ Release 0.23.3 - UNRELEASED
HADOOP-6941. Adds support for building Hadoop with IBM's JDK HADOOP-6941. Adds support for building Hadoop with IBM's JDK
(Stephen Watt, Eli and ddas) (Stephen Watt, Eli and ddas)
HADOOP-8183. Stop using "mapred.used.genericoptions.parser" (harsh)
OPTIMIZATIONS OPTIMIZATIONS
BUG FIXES BUG FIXES

2
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/GenericOptionsParser.java
View File

@ -305,7 +305,7 @@ public class GenericOptionsParser {
} }
} }
} }
conf.setBoolean("mapred.used.genericoptionsparser", true); conf.setBoolean("mapreduce.client.genericoptionsparser.used", true);
// tokensFile // tokensFile
if(line.hasOption("tokenCacheFile")) { if(line.hasOption("tokenCacheFile")) {