Author: eyang Date: Mon Aug 4 17:37:43 2014 New Revision: 1615700 URL: http://svn.apache.org/r1615700 Log: HADOOP-10759. Remove hardcoded JAVA_HEAP_MAX. (Eric Yang)
Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/bin/hadoop-config.sh Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1615700&r1=1615699&r2=1615700&view=diff ============================================================================== --- hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt (original) +++ hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt Mon Aug 4 17:37:43 2014 @@ -199,6 +199,8 @@ Trunk (Unreleased) BUG FIXES + HADOOP-10759. Remove hardcoded JAVA_HEAP_MAX. (Eric Yang) + HADOOP-9451. Fault single-layer config if node group topology is enabled. (Junping Du via llu) Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/bin/hadoop-config.sh URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/bin/hadoop-config.sh?rev=1615700&r1=1615699&r2=1615700&view=diff ============================================================================== --- hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/bin/hadoop-config.sh (original) +++ hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/bin/hadoop-config.sh Mon Aug 4 17:37:43 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