Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HADOOP-9599. Merging change r1491030 from trunk. 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1491035 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Ivan Mitic 2013-06-08 19:18:28 +00:00
parent efdbd0a006
commit 13e1c7ad4e
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-common-project/hadoop-common/CHANGES.txt
View File

@ -432,6 +432,9 @@ Release 2.1.0-beta - UNRELEASED
HADOOP-8958. ViewFs:Non absolute mount name failures when running HADOOP-8958. ViewFs:Non absolute mount name failures when running
multiple tests on Windows. (Chris Nauroth via suresh) 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 Release 2.0.5-alpha - UNRELEASED
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

8
hadoop-common-project/hadoop-common/src/main/bin/hadoop-config.cmd
View File

@ -195,13 +195,13 @@ set JAVA_PLATFORM=%JAVA_PLATFORM: =_%
@rem Check if we're running hadoop directly from the build @rem Check if we're running hadoop directly from the build
set JAVA_LIBRARY_PATH= set JAVA_LIBRARY_PATH=
if exist %HADOOP_CORE_HOME%\target\bin ( if exist %HADOOP_COMMON_HOME%\target\bin (
set JAVA_LIBRARY_PATH=%HADOOP_CORE_HOME%\target\bin set JAVA_LIBRARY_PATH=%HADOOP_COMMON_HOME%\target\bin
) )
@rem For the distro case, check the bin folder @rem For the distro case, check the bin folder
if exist %HADOOP_CORE_HOME%\bin ( if exist %HADOOP_COMMON_HOME%\bin (
set JAVA_LIBRARY_PATH=%JAVA_LIBRARY_PATH%;%HADOOP_CORE_HOME%\bin set JAVA_LIBRARY_PATH=%JAVA_LIBRARY_PATH%;%HADOOP_COMMON_HOME%\bin
) )
@rem @rem