hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ka...@apache.org
Subject svn commit: r1616028 - in /hadoop/common/branches/branch-2.5.0/hadoop-common-project/hadoop-common: CHANGES.txt src/main/bin/hadoop-config.sh
Date Tue, 05 Aug 2014 22:32:16 GMT
Author: kasha
Date: Tue Aug  5 22:32:16 2014
New Revision: 1616028

URL: http://svn.apache.org/r1616028
Log:
Reverting r1615706 (HADOOP-10759) from branch-2.5.0

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=1616028&r1=1616027&r2=1616028&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 Tue
Aug  5 22:32:16 2014
@@ -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)
 

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=1616028&r1=1616027&r2=1616028&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
Tue Aug  5 22:32:16 2014
@@ -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



Mime
View raw message