You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by su...@apache.org on 2012/11/20 20:47:42 UTC
svn commit: r1411819 - in /hadoop/common/branches/branch-1-win: CHANGES.branch-1-win.txt conf/hadoop-env.cmd

Author: suresh
Date: Tue Nov 20 19:47:41 2012
New Revision: 1411819

URL: http://svn.apache.org/viewvc?rev=1411819&view=rev
Log:
HADOOP-9062. hadoop-env.cmd overwrites the value of *_OPTS set before install. Contributed by Ivan Mitic.

Modified:
    hadoop/common/branches/branch-1-win/CHANGES.branch-1-win.txt
    hadoop/common/branches/branch-1-win/conf/hadoop-env.cmd

Modified: hadoop/common/branches/branch-1-win/CHANGES.branch-1-win.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1-win/CHANGES.branch-1-win.txt?rev=1411819&r1=1411818&r2=1411819&view=diff
==============================================================================
--- hadoop/common/branches/branch-1-win/CHANGES.branch-1-win.txt (original)
+++ hadoop/common/branches/branch-1-win/CHANGES.branch-1-win.txt Tue Nov 20 19:47:41 2012
@@ -225,3 +225,6 @@ Branch-hadoop-1-win - unreleased
     returned via winutils. (Ivan Mitic via suresh)
 
     HADOOP-9050. Remove java5 dependencies from build. (Raja Aluri via suresh)
+
+    HADOOP-9062. hadoop-env.cmd overwrites the value of *_OPTS set before
+    install. (Ivan Mitic via suresh)

Modified: hadoop/common/branches/branch-1-win/conf/hadoop-env.cmd
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1-win/conf/hadoop-env.cmd?rev=1411819&r1=1411818&r2=1411819&view=diff
==============================================================================
--- hadoop/common/branches/branch-1-win/conf/hadoop-env.cmd (original)
+++ hadoop/common/branches/branch-1-win/conf/hadoop-env.cmd Tue Nov 20 19:47:41 2012
@@ -21,12 +21,12 @@ if not defined JAVA_HOME (
 @rem set HADOOP_OPTS=-server
 
 @rem Command specific options appended to HADOOP_OPTS when specified
-set HADOOP_NAMENODE_OPTS=-Dcom.sun.management.jmxremote
-set HADOOP_SECONDARYNAMENODE_OPTS=-Dcom.sun.management.jmxremote
-set HADOOP_DATANODE_OPTS=-Dcom.sun.management.jmxremote
-set HADOOP_BALANCER_OPTS=-Dcom.sun.management.jmxremote
-set HADOOP_JOBTRACKER_OPTS=-Dcom.sun.management.jmxremote
-set HADOOP_TASKTRACKER_OPTS=-Dcom.sun.management.jmxremote
+set HADOOP_NAMENODE_OPTS=-Dcom.sun.management.jmxremote %HADOOP_NAMENODE_OPTS%
+set HADOOP_SECONDARYNAMENODE_OPTS=-Dcom.sun.management.jmxremote %HADOOP_SECONDARYNAMENODE_OPTS%
+set HADOOP_DATANODE_OPTS=-Dcom.sun.management.jmxremote %HADOOP_DATANODE_OPTS%
+set HADOOP_BALANCER_OPTS=-Dcom.sun.management.jmxremote %HADOOP_BALANCER_OPTS%
+set HADOOP_JOBTRACKER_OPTS=-Dcom.sun.management.jmxremote %HADOOP_JOBTRACKER_OPTS%
+set HADOOP_TASKTRACKER_OPTS=-Dcom.sun.management.jmxremote %HADOOP_TASKTRACKER_OPTS%
 
 @rem The following applies to multiple commands (fs, dfs, fsck, distcp etc)
 @rem set HADOOP_CLIENT_OPTS