Author: suresh
Date: Tue Oct 9 16:35:58 2012
New Revision: 1396101
URL: http://svn.apache.org/viewvc?rev=1396101&view=rev
Log:
HADOOP-8903. support HADOOP_USER_CLASSPATH_FIRST in windows hadoop cmd.
Contributed by Thejas Nair.
Modified:
hadoop/common/branches/branch-1-win/CHANGES.branch-1-win.txt
hadoop/common/branches/branch-1-win/bin/hadoop-config.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=1396101&r1=1396100&r2=1396101&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 Oct 9
16:35:58 2012
@@ -152,3 +152,6 @@ BUG FIXES
HADOOP-8880. Missing jersey jars as dependency in the pom causes
hive tests to fail. (gkesavan via suresh)
+
+ HADOOP-8903. support HADOOP_USER_CLASSPATH_FIRST in windows hadoop cmd.
+ (Thejas Nair via suresh)
Modified: hadoop/common/branches/branch-1-win/bin/hadoop-config.cmd
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1-win/bin/hadoop-config.cmd?rev=1396101&r1=1396100&r2=1396101&view=diff
==============================================================================
--- hadoop/common/branches/branch-1-win/bin/hadoop-config.cmd (original)
+++ hadoop/common/branches/branch-1-win/bin/hadoop-config.cmd Tue Oct 9
16:35:58 2012
@@ -154,7 +154,12 @@ for %%i in (%HADOOP_CORE_HOME%\lib\jsp-2
@rem
if defined HADOOP_CLASSPATH (
- set CLASSPATH=%CLASSPATH%;%HADOOP_CLASSPATH%
+ if defined HADOOP_USER_CLASSPATH_FIRST (
+ set CLASSPATH=%HADOOP_CLASSPATH%;%CLASSPATH%;
+ )
+ if not defined HADOOP_USER_CLASSPATH_FIRST (
+ set CLASSPATH=%CLASSPATH%;%HADOOP_CLASSPATH%;
+ )
)
if not defined HADOOP_LOG_DIR (
