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

HADOOP-10759. Remove hardcoded JAVA_HEAP_MAX. (Sam Liu via Eric Yang) 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2.5@1615705 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Eric Yang 2014-08-04 17:41:24 +00:00
parent 029165bdde
commit bf4bc9c6df
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -138,6 +138,8 @@ Release 2.5.0 - UNRELEASED
BUG FIXES BUG FIXES
HADOOP-10759. Remove hardcoded JAVA_HEAP_MAX. (Sam Liu via Eric Yang)
HADOOP-10378. Typo in help printed by hdfs dfs -help. HADOOP-10378. Typo in help printed by hdfs dfs -help.
(Mit Desai via suresh) (Mit Desai via suresh)

2
hadoop-common-project/hadoop-common/src/main/bin/hadoop-config.sh
View File

@ -149,8 +149,6 @@ if [[ -z $JAVA_HOME ]]; then
fi fi
JAVA=$JAVA_HOME/bin/java JAVA=$JAVA_HOME/bin/java
# some Java parameters
JAVA_HEAP_MAX=-Xmx1000m
# check envvars which might override default args # check envvars which might override default args
if [ "$HADOOP_HEAPSIZE" != "" ]; then if [ "$HADOOP_HEAPSIZE" != "" ]; then