From 1ea3bdaa0644d15df68e52acbca3f97e9beea946 Mon Sep 17 00:00:00 2001 From: Suresh Srinivas Date: Wed, 1 May 2013 16:17:17 +0000 Subject: [PATCH] HADOOP-9532. HADOOP_CLIENT_OPTS is appended twice by Windows cmd scripts. Contributed by Chris Nauroth. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1478072 13f79535-47bb-0310-9956-ffa450edef68 --- hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++ .../hadoop-common/src/main/conf/hadoop-env.cmd | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index 9eed40da500..d30119c6b09 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -536,6 +536,9 @@ Trunk (Unreleased) HADOOP-9413. Add common utils for File#setReadable/Writable/Executable & File#canRead/Write/Execute that work cross-platform. (Ivan Mitic via suresh) + + HADOOP-9532. HADOOP_CLIENT_OPTS is appended twice by Windows cmd scripts. + (Chris Nauroth via suresh) Release 2.0.5-beta - UNRELEASED diff --git a/hadoop-common-project/hadoop-common/src/main/conf/hadoop-env.cmd b/hadoop-common-project/hadoop-common/src/main/conf/hadoop-env.cmd index 6e34fe91984..08c85d80d4b 100644 --- a/hadoop-common-project/hadoop-common/src/main/conf/hadoop-env.cmd +++ b/hadoop-common-project/hadoop-common/src/main/conf/hadoop-env.cmd @@ -43,7 +43,7 @@ if exist %HADOOP_HOME%\contrib\capacity-scheduler ( @rem set HADOOP_NAMENODE_INIT_HEAPSIZE="" @rem Extra Java runtime options. Empty by default. -@rem set HADOOP_OPTS=-Djava.net.preferIPv4Stack=true %HADOOP_CLIENT_OPTS% +@rem set HADOOP_OPTS=-Djava.net.preferIPv4Stack=true @rem Command specific options appended to HADOOP_OPTS when specified if not defined HADOOP_SECURITY_LOGGER (