Author: cnauroth
Date: Mon Oct 14 18:39:16 2013
New Revision: 1532019
URL: http://svn.apache.org/r1532019
Log:
MAPREDUCE-5546. Merging change r1532017 from branch-2 to branch-2.2
Modified:
hadoop/common/branches/branch-2.2/hadoop-mapreduce-project/CHANGES.txt
hadoop/common/branches/branch-2.2/hadoop-mapreduce-project/bin/mapred.cmd
Modified: hadoop/common/branches/branch-2.2/hadoop-mapreduce-project/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.2/hadoop-mapreduce-project/CHANGES.txt?rev=1532019&r1=1532018&r2=1532019&view=diff
==============================================================================
--- hadoop/common/branches/branch-2.2/hadoop-mapreduce-project/CHANGES.txt
(original)
+++ hadoop/common/branches/branch-2.2/hadoop-mapreduce-project/CHANGES.txt Mon
Oct 14 18:39:16 2013
@@ -22,6 +22,9 @@ Release 2.2.1 - UNRELEASED
MAPREDUCE-5569. FloatSplitter is not generating correct splits (Nathan
Roberts via jlowe)
+ MAPREDUCE-5546. mapred.cmd on Windows set HADOOP_OPTS incorrectly (Chuan
Liu
+ via cnauroth)
+
Release 2.2.0 - 2013-10-13
INCOMPATIBLE CHANGES
Modified:
hadoop/common/branches/branch-2.2/hadoop-mapreduce-project/bin/mapred.cmd
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.2/hadoop-mapreduce-project/bin/mapred.cmd?rev=1532019&r1=1532018&r2=1532019&view=diff
==============================================================================
--- hadoop/common/branches/branch-2.2/hadoop-mapreduce-project/bin/mapred.cmd
(original)
+++ hadoop/common/branches/branch-2.2/hadoop-mapreduce-project/bin/mapred.cmd
Mon Oct 14 18:39:16 2013
@@ -91,7 +91,7 @@ if "%1" == "--config" (
set CLASSPATH=%CLASSPATH%;%HADOOP_MAPRED_HOME%\modules\*
call :%mapred-command% %mapred-command-arguments%
- set java_arguments=%JAVA_HEAP_MAX% %MAPRED_OPTS% -classpath %CLASSPATH%
%CLASS% %mapred-command-arguments%
+ set java_arguments=%JAVA_HEAP_MAX% %HADOOP_OPTS% -classpath %CLASSPATH%
%CLASS% %mapred-command-arguments%
call %JAVA% %java_arguments%
goto :eof
@@ -118,7 +118,7 @@ goto :eof
:historyserver
set CLASS=org.apache.hadoop.mapreduce.v2.hs.JobHistoryServer
- set HADOOP_OPTS=%HADOOP_OPTS% -Dmapred.jobsummary.logger=%HADOOP_JHS_LOGGER%
%HADOOP_JOB_HISTORYSERVER_OPTS%"
+ set HADOOP_OPTS=%HADOOP_OPTS% -Dmapred.jobsummary.logger=%HADOOP_JHS_LOGGER%
%HADOOP_JOB_HISTORYSERVER_OPTS%
if defined HADOOP_JOB_HISTORYSERVER_HEAPSIZE (
set JAVA_HEAP_MAX=-Xmx%HADOOP_JOB_HISTORYSERVER_HEAPSIZE%m
)
