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
2014-08-05 22:41:07 +00:00 · 2014-08-05 22:41:07 +00:00 · 7a8c78f68a
parent 2931aee384
commit 7a8c78f68a
2 changed files with 2 additions and 2 deletions
--- 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)

--- 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