From 7a8c78f68ac266509e46ea0f965cc0724835caeb Mon Sep 17 00:00:00 2001 From: Karthik Kambatla Date: Tue, 5 Aug 2014 22:41:07 +0000 Subject: [PATCH] Reverting r1615705 (HADOOP-10759) from branch-2.5 git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2.5@1616033 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 300b1cbe1f3..ce1a9e79f68 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -138,8 +138,6 @@ 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) 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 f030b8321b0..8cfa183e7d8 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,6 +149,8 @@ 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