Author: cnauroth
Date: Tue Sep 10 22:54:37 2013
New Revision: 1521672
URL: http://svn.apache.org/r1521672
Log:
YARN-1025. Merging change r1521671 from branch-2 to branch-2.1-beta
Modified:
hadoop/common/branches/branch-2.1-beta/hadoop-yarn-project/CHANGES.txt
hadoop/common/branches/branch-2.1-beta/hadoop-yarn-project/hadoop-yarn/bin/yarn.cmd
Modified: hadoop/common/branches/branch-2.1-beta/hadoop-yarn-project/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.1-beta/hadoop-yarn-project/CHANGES.txt?rev=1521672&r1=1521671&r2=1521672&view=diff
==============================================================================
--- hadoop/common/branches/branch-2.1-beta/hadoop-yarn-project/CHANGES.txt
(original)
+++ hadoop/common/branches/branch-2.1-beta/hadoop-yarn-project/CHANGES.txt Tue
Sep 10 22:54:37 2013
@@ -147,6 +147,9 @@ Release 2.1.1-beta - UNRELEASED
data structures thread safe to avoid RM crashing with
ArrayIndexOutOfBoundsException. (Zhijie Shen via vinodkv)
+ YARN-1025. ResourceManager and NodeManager do not load native libraries on
+ Windows. (cnauroth)
+
Release 2.1.0-beta - 2013-08-22
INCOMPATIBLE CHANGES
Modified:
hadoop/common/branches/branch-2.1-beta/hadoop-yarn-project/hadoop-yarn/bin/yarn.cmd
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.1-beta/hadoop-yarn-project/hadoop-yarn/bin/yarn.cmd?rev=1521672&r1=1521671&r2=1521672&view=diff
==============================================================================
---
hadoop/common/branches/branch-2.1-beta/hadoop-yarn-project/hadoop-yarn/bin/yarn.cmd
(original)
+++
hadoop/common/branches/branch-2.1-beta/hadoop-yarn-project/hadoop-yarn/bin/yarn.cmd
Tue Sep 10 22:54:37 2013
@@ -135,6 +135,10 @@ if "%1" == "--config" (
call :%yarn-command% %yarn-command-arguments%
+ if defined JAVA_LIBRARY_PATH (
+ set YARN_OPTS=%YARN_OPTS% -Djava.library.path=%JAVA_LIBRARY_PATH%
+ )
+
set java_arguments=%JAVA_HEAP_MAX% %YARN_OPTS% -classpath %CLASSPATH%
%CLASS% %yarn-command-arguments%
call %JAVA% %java_arguments%
