From c5f7e137d3895d4727b3adc0d928b84c78beee0b Mon Sep 17 00:00:00 2001 From: Chris Nauroth Date: Mon, 14 Oct 2013 18:37:41 +0000 Subject: [PATCH] MAPREDUCE-5546. Merging change r1532016 from trunk to branch-2. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1532017 13f79535-47bb-0310-9956-ffa450edef68 --- hadoop-mapreduce-project/CHANGES.txt | 3 +++ hadoop-mapreduce-project/bin/mapred.cmd | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt index 2bce2366745..3f244b8a8d2 100644 --- a/hadoop-mapreduce-project/CHANGES.txt +++ b/hadoop-mapreduce-project/CHANGES.txt @@ -76,6 +76,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 diff --git a/hadoop-mapreduce-project/bin/mapred.cmd b/hadoop-mapreduce-project/bin/mapred.cmd index b2d53fa145e..1eb5803fbab 100644 --- a/hadoop-mapreduce-project/bin/mapred.cmd +++ b/hadoop-mapreduce-project/bin/mapred.cmd @@ -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 )