Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert HADOOP-10759 due to aw veto 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619692 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Christopher Douglas 2014-08-22 07:17:51 +00:00
parent a6f5f71a12
commit 7ca74a025e
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hadoop-common-project/hadoop-common/CHANGES.txt
View File

@ -221,8 +221,6 @@ Release 2.6.0 - UNRELEASED
HADOOP-10933. FileBasedKeyStoresFactory Should use Configuration.getPassword HADOOP-10933. FileBasedKeyStoresFactory Should use Configuration.getPassword
for SSL Passwords. (lmccay via tucu) for SSL Passwords. (lmccay via tucu)
HADOOP-10759. Remove hardcoded JAVA_HEAP_MAX. (Sam Liu via Eric Yang)
HADOOP-10905. LdapGroupsMapping Should use configuration.getPassword for SSL HADOOP-10905. LdapGroupsMapping Should use configuration.getPassword for SSL
and LDAP Passwords. (lmccay via brandonli) and LDAP Passwords. (lmccay via brandonli)

2
hadoop-common-project/hadoop-common/src/main/bin/hadoop-config.sh
View File

@ -166,6 +166,8 @@ if [[ -z $JAVA_HOME ]]; then
fi fi
JAVA=$JAVA_HOME/bin/java JAVA=$JAVA_HOME/bin/java
# some Java parameters
JAVA_HEAP_MAX=-Xmx1000m
# check envvars which might override default args # check envvars which might override default args
if [ "$HADOOP_HEAPSIZE" != "" ]; then if [ "$HADOOP_HEAPSIZE" != "" ]; then