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 iv...@apache.org on 2013/06/08 23:20:22 UTC

svn commit: r1491063 - in /hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common: CHANGES.txt src/main/bin/hadoop-config.cmd

Author: ivanmi
Date: Sat Jun  8 21:20:22 2013
New Revision: 1491063

URL: http://svn.apache.org/r1491063
Log:
HADOOP-9599. Merging change r1491035 from branch-2.

Modified:
    hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/CHANGES.txt
    hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/src/main/bin/hadoop-config.cmd

Modified: hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1491063&r1=1491062&r2=1491063&view=diff
==============================================================================
--- hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/CHANGES.txt (original)
+++ hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/CHANGES.txt Sat Jun  8 21:20:22 2013
@@ -408,6 +408,9 @@ Release 2.1.0-beta - UNRELEASED
     HADOOP-8958. ViewFs:Non absolute mount name failures when running 
     multiple tests on Windows. (Chris Nauroth via suresh)
 
+    HADOOP-9599. hadoop-config.cmd doesn't set JAVA_LIBRARY_PATH correctly.
+    (Mostafa Elhemali via ivanmi)
+
 Release 2.0.5-alpha - UNRELEASED
 
   INCOMPATIBLE CHANGES

Modified: hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/src/main/bin/hadoop-config.cmd
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/src/main/bin/hadoop-config.cmd?rev=1491063&r1=1491062&r2=1491063&view=diff
==============================================================================
--- hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/src/main/bin/hadoop-config.cmd (original)
+++ hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/src/main/bin/hadoop-config.cmd Sat Jun  8 21:20:22 2013
@@ -195,13 +195,13 @@ set JAVA_PLATFORM=%JAVA_PLATFORM: =_%
 
 @rem Check if we're running hadoop directly from the build
 set JAVA_LIBRARY_PATH=
-if exist %HADOOP_CORE_HOME%\target\bin (
-  set JAVA_LIBRARY_PATH=%HADOOP_CORE_HOME%\target\bin
+if exist %HADOOP_COMMON_HOME%\target\bin (
+  set JAVA_LIBRARY_PATH=%HADOOP_COMMON_HOME%\target\bin
 )
 
 @rem For the distro case, check the bin folder
-if exist %HADOOP_CORE_HOME%\bin (
-  set JAVA_LIBRARY_PATH=%JAVA_LIBRARY_PATH%;%HADOOP_CORE_HOME%\bin
+if exist %HADOOP_COMMON_HOME%\bin (
+  set JAVA_LIBRARY_PATH=%JAVA_LIBRARY_PATH%;%HADOOP_COMMON_HOME%\bin
 )
 
 @rem