You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by ma...@apache.org on 2011/12/01 03:42:11 UTC
svn commit: r1208937 - in /hadoop/common/branches/branch-1.0: CHANGES.txt
bin/hadoop bin/hadoop-config.sh
Author: mattf
Date: Thu Dec 1 02:42:10 2011
New Revision: 1208937
URL: http://svn.apache.org/viewvc?rev=1208937&view=rev
Log:
HADOOP-7869. HADOOP_HOME warning happens all of the time. Contributed by Owen O'Malley
Modified:
hadoop/common/branches/branch-1.0/CHANGES.txt (contents, props changed)
hadoop/common/branches/branch-1.0/bin/hadoop
hadoop/common/branches/branch-1.0/bin/hadoop-config.sh
Modified: hadoop/common/branches/branch-1.0/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1.0/CHANGES.txt?rev=1208937&r1=1208936&r2=1208937&view=diff
==============================================================================
--- hadoop/common/branches/branch-1.0/CHANGES.txt (original)
+++ hadoop/common/branches/branch-1.0/CHANGES.txt Thu Dec 1 02:42:10 2011
@@ -60,6 +60,9 @@ Release 1.0.0 - 2011.11.27
BUG FIXES
+ HADOOP-7869. HADOOP_HOME warning happens all of the time (Owen O'Malley
+ via mattf)
+
HADOOP-7815. Fixed configuring map memory mb in hadoop-setup-conf.sh.
(Ramya Sunil)
Propchange: hadoop/common/branches/branch-1.0/CHANGES.txt
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Dec 1 02:42:10 2011
@@ -3,7 +3,7 @@
/hadoop/common/branches/branch-0.20-security/CHANGES.txt:1170042,1170087,1170997,1171137,1171181,1171380,1171613,1171891,1171905,1172184,1172188,1172190,1172192,1173470,1173843,1174326,1174471,1174476,1174482,1175114,1176179,1176182,1176270,1176276,1176675,1176720,1177031,1177036,1177098,1177101,1177907,1178074,1179036,1179171,1179471,1179519,1179713,1179722,1179857,1179919,1183086,1183101,1183176,1183556,1186509,1187141,1189029,1189361,1190079,1190089,1190100,1195737,1197330,1198906,1199401,1199571,1200733,1205148,1205655,1206180
/hadoop/common/branches/branch-0.20-security-203/CHANGES.txt:1096071,1097011,1097249,1097269,1097281,1097966,1098816,1098819,1098823,1098827,1098832,1098839,1098854,1098863,1099088,1099191,1099324,1099330,1099333,1102071,1128115
/hadoop/common/branches/branch-0.20-security-204/CHANGES.txt:1128390,1147228,1148069,1149316,1154413,1159730,1161741
-/hadoop/common/branches/branch-1/CHANGES.txt:1207579,1208143
+/hadoop/common/branches/branch-1/CHANGES.txt:1207579,1208143,1208936
/hadoop/core/branches/branch-0.18/CHANGES.txt:727226
/hadoop/core/branches/branch-0.19/CHANGES.txt:713112
/hadoop/core/trunk/CHANGES.txt:727001,727117,727191,727212,727228,727255,727869,728187,729052,729987,732385,732572,732613,732777,732838,732869,733887,734870,734916,735082,736426,738602,738697,739416,740077,740157,741703,741762,743296,743745,743816,743892,744894,745180,745268,746010,746193,746206,746227,746233,746274,746902-746903,746925,746944,746968,746970,747279,747289,747802,748084,748090,748783,749262,749318,749863,750533,752073,752514,752555,752590,752609,752834,752836,752913,752932,753112-753113,753346,754645,754847,754927,755035,755226,755348,755370,755418,755426,755790,755905,755938,755986,755998,756352,757448,757624,757849,758156,758180,759398,759932,760502,760783,761046,761482,761632,762216,762879,763107,763502,764967,765016,765809,765951,771607,772844,772876,772884,772920,773889,776638,778962,778966,779893,781720,784661,785046,785569
Modified: hadoop/common/branches/branch-1.0/bin/hadoop
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1.0/bin/hadoop?rev=1208937&r1=1208936&r2=1208937&view=diff
==============================================================================
--- hadoop/common/branches/branch-1.0/bin/hadoop (original)
+++ hadoop/common/branches/branch-1.0/bin/hadoop Thu Dec 1 02:42:10 2011
@@ -56,11 +56,6 @@ else
. "$bin"/hadoop-config.sh
fi
-if [ "$HADOOP_HOME_WARN_SUPPRESS" == "" ] && [ "$HADOOP_HOME" != "" ]; then
- echo "Warning: \$HADOOP_HOME is deprecated." 1>&2
- echo 1>&2
-fi
-
cygwin=false
case "`uname`" in
CYGWIN*) cygwin=true;;
@@ -103,10 +98,6 @@ fi
COMMAND=$1
shift
-if [ -f "${HADOOP_CONF_DIR}/hadoop-env.sh" ]; then
- . "${HADOOP_CONF_DIR}/hadoop-env.sh"
-fi
-
# Determine if we're starting a secure datanode, and if so, redefine appropriate variables
if [ "$COMMAND" == "datanode" ] && [ "$EUID" -eq 0 ] && [ -n "$HADOOP_SECURE_DN_USER" ]; then
HADOOP_PID_DIR=$HADOOP_SECURE_DN_PID_DIR
Modified: hadoop/common/branches/branch-1.0/bin/hadoop-config.sh
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1.0/bin/hadoop-config.sh?rev=1208937&r1=1208936&r2=1208937&view=diff
==============================================================================
--- hadoop/common/branches/branch-1.0/bin/hadoop-config.sh (original)
+++ hadoop/common/branches/branch-1.0/bin/hadoop-config.sh Thu Dec 1 02:42:10 2011
@@ -32,7 +32,6 @@ this="$config_bin/$script"
# the root of the Hadoop installation
export HADOOP_PREFIX=`dirname "$this"`/..
-export HADOOP_HOME=${HADOOP_PREFIX}
#check to see if the conf dir is given as an optional argument
if [ $# -gt 1 ]
@@ -66,3 +65,16 @@ then
export HADOOP_SLAVES="${HADOOP_CONF_DIR}/$slavesfile"
fi
fi
+
+if [ -f "${HADOOP_CONF_DIR}/hadoop-env.sh" ]; then
+ . "${HADOOP_CONF_DIR}/hadoop-env.sh"
+fi
+
+if [ "$HADOOP_HOME_WARN_SUPPRESS" == "" ] && [ "$HADOOP_HOME" != "" ]; then
+ echo "Warning: \$HADOOP_HOME is deprecated." 1>&2
+ echo 1>&2
+fi
+
+export HADOOP_HOME=${HADOOP_PREFIX}
+export HADOOP_HOME_WARN_SUPPRESS=1
+