From 9ffc4b13c46ca607daae79b6afca3bda45309215 Mon Sep 17 00:00:00 2001 From: Eric Yang Date: Mon, 4 Aug 2014 17:37:43 +0000 Subject: [PATCH] HADOOP-10759. Remove hardcoded JAVA_HEAP_MAX. (Eric Yang) git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1615700 13f79535-47bb-0310-9956-ffa450edef68 --- hadoop-common-project/hadoop-common/CHANGES.txt | 2 ++ .../hadoop-common/src/main/bin/hadoop-config.sh | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index 0887d047d2a..0a920f40c83 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -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) diff --git a/hadoop-common-project/hadoop-common/src/main/bin/hadoop-config.sh b/hadoop-common-project/hadoop-common/src/main/bin/hadoop-config.sh index 6581ab4ada1..a0fb9d0c99d 100644 --- a/hadoop-common-project/hadoop-common/src/main/bin/hadoop-config.sh +++ b/hadoop-common-project/hadoop-common/src/main/bin/hadoop-config.sh @@ -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