Author: eyang
Date: Mon Aug 4 17:42:48 2014
New Revision: 1615706
URL: http://svn.apache.org/r1615706
Log:
HADOOP-10759. Remove hardcoded JAVA_HEAP_MAX. (Sam Liu via Eric Yang)
Modified:
hadoop/common/branches/branch-2.5.0/hadoop-common-project/hadoop-common/CHANGES.txt
hadoop/common/branches/branch-2.5.0/hadoop-common-project/hadoop-common/src/main/bin/hadoop-config.sh
Modified:
hadoop/common/branches/branch-2.5.0/hadoop-common-project/hadoop-common/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.5.0/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1615706&r1=1615705&r2=1615706&view=diff
==============================================================================
---
hadoop/common/branches/branch-2.5.0/hadoop-common-project/hadoop-common/CHANGES.txt
(original)
+++
hadoop/common/branches/branch-2.5.0/hadoop-common-project/hadoop-common/CHANGES.txt
Mon Aug 4 17:42:48 2014
@@ -138,6 +138,8 @@ Release 2.5.0 - UNRELEASED
BUG FIXES
+ HADOOP-10759. Remove hardcoded JAVA_HEAP_MAX. (Sam Liu via Eric Yang)
+
HADOOP-10378. Typo in help printed by hdfs dfs -help.
(Mit Desai via suresh)
Modified:
hadoop/common/branches/branch-2.5.0/hadoop-common-project/hadoop-common/src/main/bin/hadoop-config.sh
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.5.0/hadoop-common-project/hadoop-common/src/main/bin/hadoop-config.sh?rev=1615706&r1=1615705&r2=1615706&view=diff
==============================================================================
---
hadoop/common/branches/branch-2.5.0/hadoop-common-project/hadoop-common/src/main/bin/hadoop-config.sh
(original)
+++
hadoop/common/branches/branch-2.5.0/hadoop-common-project/hadoop-common/src/main/bin/hadoop-config.sh
Mon Aug 4 17:42:48 2014
@@ -149,8 +149,6 @@ if [[ -z $JAVA_HOME ]]; then
fi
JAVA=$JAVA_HOME/bin/java
-# some Java parameters
-JAVA_HEAP_MAX=-Xmx1000m
# check envvars which might override default args
if [ "$HADOOP_HEAPSIZE" != "" ]; then
