From 103226cc918f89676a43df1d575ddf5706b12bde Mon Sep 17 00:00:00 2001
From: Devarajulu K <devaraj@apache.org>
Date: Thu, 12 Sep 2013 14:34:39 +0000
Subject: [PATCH] MAPREDUCE-5164. mapred job and queue commands omit
 HADOOP_CLIENT_OPTS. Contributed by Nemon Lou. Merged revision 1522595 from
 trunk.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1522597 13f79535-47bb-0310-9956-ffa450edef68
---
 hadoop-mapreduce-project/CHANGES.txt    | 3 +++
 hadoop-mapreduce-project/bin/mapred     | 2 ++
 hadoop-mapreduce-project/bin/mapred.cmd | 2 ++
 3 files changed, 7 insertions(+)

diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt
index e2d69cca043..0d448eabc56 100644
--- a/hadoop-mapreduce-project/CHANGES.txt
+++ b/hadoop-mapreduce-project/CHANGES.txt
@@ -125,6 +125,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
diff --git a/hadoop-mapreduce-project/bin/mapred b/hadoop-mapreduce-project/bin/mapred
index 6f77ddca824..10050dc21ce 100755
--- a/hadoop-mapreduce-project/bin/mapred
+++ b/hadoop-mapreduce-project/bin/mapred
@@ -61,8 +61,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"
diff --git a/hadoop-mapreduce-project/bin/mapred.cmd b/hadoop-mapreduce-project/bin/mapred.cmd
index d26b930e378..b2d53fa145e 100644
--- a/hadoop-mapreduce-project/bin/mapred.cmd
+++ b/hadoop-mapreduce-project/bin/mapred.cmd
@@ -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