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/09/29 01:07:09 UTC
svn commit: r1177102 - in /hadoop/common/branches/branch-0.20-security-205:
CHANGES.txt src/packages/templates/conf/hadoop-env.sh
Author: mattf
Date: Wed Sep 28 23:07:08 2011
New Revision: 1177102
URL: http://svn.apache.org/viewvc?rev=1177102&view=rev
Log:
MAPREDUCE-3112. Calling hadoop cli inside mapreduce job leads to errors. Contributed by Eric Yang.
Modified:
hadoop/common/branches/branch-0.20-security-205/CHANGES.txt (contents, props changed)
hadoop/common/branches/branch-0.20-security-205/src/packages/templates/conf/hadoop-env.sh
Modified: hadoop/common/branches/branch-0.20-security-205/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-205/CHANGES.txt?rev=1177102&r1=1177101&r2=1177102&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-205/CHANGES.txt (original)
+++ hadoop/common/branches/branch-0.20-security-205/CHANGES.txt Wed Sep 28 23:07:08 2011
@@ -47,6 +47,9 @@ Release 0.20.205.0 - 2011.09.27
BUG FIXES
+ MAPREDUCE-3112. Calling hadoop cli inside mapreduce job leads to errors.
+ (Eric Yang via mattf)
+
HDFS-7691. Hadoop deb pkg group id. (Eric Yang via mattf)
HADOOP-7685. Resolve issues with hadoop-common file hadoop-setup-conf.sh.
Propchange: hadoop/common/branches/branch-0.20-security-205/CHANGES.txt
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Sep 28 23:07:08 2011
@@ -1,6 +1,6 @@
/hadoop/common/branches/branch-0.20/CHANGES.txt:826138,826568,829987,831184,833001,880632,898713,909245,909723,960946,990003,1044225
/hadoop/common/branches/branch-0.20-append/CHANGES.txt:955380,955398,955448,956329
-/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
+/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
/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/core/branches/branch-0.18/CHANGES.txt:727226
Modified: hadoop/common/branches/branch-0.20-security-205/src/packages/templates/conf/hadoop-env.sh
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-205/src/packages/templates/conf/hadoop-env.sh?rev=1177102&r1=1177101&r2=1177102&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-205/src/packages/templates/conf/hadoop-env.sh (original)
+++ hadoop/common/branches/branch-0.20-security-205/src/packages/templates/conf/hadoop-env.sh Wed Sep 28 23:07:08 2011
@@ -14,7 +14,7 @@ export HADOOP_CONF_DIR=${HADOOP_CONF_DIR
#export HADOOP_NAMENODE_INIT_HEAPSIZE=""
# Extra Java runtime options. Empty by default.
-export HADOOP_OPTS="-Djava.net.preferIPv4Stack=true $HADOOP_OPTS"
+export HADOOP_OPTS="-Djava.net.preferIPv4Stack=true $HADOOP_CLIENT_OPTS"
# Command specific options appended to HADOOP_OPTS when specified
export HADOOP_NAMENODE_OPTS="-Dsecurity.audit.logger=INFO,DRFAS -Dhdfs.audit.logger=INFO,DRFAAUDIT ${HADOOP_NAMENODE_OPTS}"