Author: devaraj
Date: Thu Sep 12 14:35:44 2013
New Revision: 1522598
URL: http://svn.apache.org/r1522598
Log:
MAPREDUCE-5164. mapred job and queue commands omit HADOOP_CLIENT_OPTS.
Contributed by Nemon Lou.
Merged revision 1522595 from trunk.
Modified:
hadoop/common/branches/branch-2.1-beta/hadoop-mapreduce-project/CHANGES.txt
hadoop/common/branches/branch-2.1-beta/hadoop-mapreduce-project/bin/mapred
hadoop/common/branches/branch-2.1-beta/hadoop-mapreduce-project/bin/mapred.cmd
Modified:
hadoop/common/branches/branch-2.1-beta/hadoop-mapreduce-project/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.1-beta/hadoop-mapreduce-project/CHANGES.txt?rev=1522598&r1=1522597&r2=1522598&view=diff
==============================================================================
--- hadoop/common/branches/branch-2.1-beta/hadoop-mapreduce-project/CHANGES.txt
(original)
+++ hadoop/common/branches/branch-2.1-beta/hadoop-mapreduce-project/CHANGES.txt
Thu Sep 12 14:35:44 2013
@@ -87,6 +87,9 @@ Release 2.1.1-beta - UNRELEASED
MAPREDUCE-5020. Compile failure with JDK8 (Trevor Robinson via tgraves)
+ MAPREDUCE-5164. mapred job and queue commands omit HADOOP_CLIENT_OPTS
+ (Nemon Lou via devaraj)
+
Release 2.1.0-beta - 2013-08-22
INCOMPATIBLE CHANGES
Modified:
hadoop/common/branches/branch-2.1-beta/hadoop-mapreduce-project/bin/mapred
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.1-beta/hadoop-mapreduce-project/bin/mapred?rev=1522598&r1=1522597&r2=1522598&view=diff
==============================================================================
--- hadoop/common/branches/branch-2.1-beta/hadoop-mapreduce-project/bin/mapred
(original)
+++ hadoop/common/branches/branch-2.1-beta/hadoop-mapreduce-project/bin/mapred
Thu Sep 12 14:35:44 2013
@@ -60,8 +60,10 @@ esac
if [ "$COMMAND" = "job" ] ; then
CLASS=org.apache.hadoop.mapred.JobClient
+ HADOOP_OPTS="$HADOOP_OPTS $HADOOP_CLIENT_OPTS"
elif [ "$COMMAND" = "queue" ] ; then
CLASS=org.apache.hadoop.mapred.JobQueueClient
+ HADOOP_OPTS="$HADOOP_OPTS $HADOOP_CLIENT_OPTS"
elif [ "$COMMAND" = "pipes" ] ; then
CLASS=org.apache.hadoop.mapred.pipes.Submitter
HADOOP_OPTS="$HADOOP_OPTS $HADOOP_CLIENT_OPTS"
Modified:
hadoop/common/branches/branch-2.1-beta/hadoop-mapreduce-project/bin/mapred.cmd
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.1-beta/hadoop-mapreduce-project/bin/mapred.cmd?rev=1522598&r1=1522597&r2=1522598&view=diff
==============================================================================
---
hadoop/common/branches/branch-2.1-beta/hadoop-mapreduce-project/bin/mapred.cmd
(original)
+++
hadoop/common/branches/branch-2.1-beta/hadoop-mapreduce-project/bin/mapred.cmd
Thu Sep 12 14:35:44 2013
@@ -103,10 +103,12 @@ goto :eof
:job
set CLASS=org.apache.hadoop.mapred.JobClient
+ set HADOOP_OPTS=%HADOOP_OPTS% %HADOOP_CLIENT_OPTS%
goto :eof
:queue
set CLASS=org.apache.hadoop.mapred.JobQueueClient
+ set HADOOP_OPTS=%HADOOP_OPTS% %HADOOP_CLIENT_OPTS%
goto :eof
:sampler
