Author: ddas
Date: Sat Sep 17 06:00:16 2011
New Revision: 1171906
URL: http://svn.apache.org/viewvc?rev=1171906&view=rev
Log:
Merge -r 1171904:1171905 from branch-0.20-security onto
branch-0.20-security-205. Fixes HADOOP-7633.
Modified:
hadoop/common/branches/branch-0.20-security-205/CHANGES.txt (contents,
props changed)
hadoop/common/branches/branch-0.20-security-205/src/packages/hadoop-setup-conf.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=1171906&r1=1171905&r2=1171906&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-205/CHANGES.txt (original)
+++ hadoop/common/branches/branch-0.20-security-205/CHANGES.txt Sat Sep 17
06:00:16 2011
@@ -154,6 +154,9 @@ Release 0.20.205.0 - 2011.09.12
HADOOP-7637. Fix to include FairScheduler configuration file in
RPM. (Eric Yang via ddas)
+ HADOOP-7633. Adds log4j.properties to the hadoop-conf dir on
+ deploy (Eric Yang via ddas)
+
IMPROVEMENTS
MAPREDUCE-2187. Reporter sends progress during sort/merge. (Anupam Seth via
Propchange: hadoop/common/branches/branch-0.20-security-205/CHANGES.txt
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Sep 17 06:00:16 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,1171181,1171891
+/hadoop/common/branches/branch-0.20-security/CHANGES.txt:1170042,1171181,1171891,1171905
/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/hadoop-setup-conf.sh
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-205/src/packages/hadoop-setup-conf.sh?rev=1171906&r1=1171905&r2=1171906&view=diff
==============================================================================
---
hadoop/common/branches/branch-0.20-security-205/src/packages/hadoop-setup-conf.sh
(original)
+++
hadoop/common/branches/branch-0.20-security-205/src/packages/hadoop-setup-conf.sh
Sat Sep 17 06:00:16 2011
@@ -434,6 +434,9 @@ if [ "${AUTOSETUP}" == "1" -o "${AUTOSET
if [ ! -e ${HADOOP_CONF_DIR}/capacity-scheduler.xml ]; then
template_generator
${HADOOP_PREFIX}/share/hadoop/templates/conf/capacity-scheduler.xml
${HADOOP_CONF_DIR}/capacity-scheduler.xml
fi
+ if [ ! -e ${HADOOP_CONF_DIR}/log4j.properties ]; then
+ cp ${HADOOP_PREFIX}/share/hadoop/templates/conf/log4j.properties
${HADOOP_CONF_DIR}/log4j.properties
+ fi
#set the owner of the hadoop dir to root
chown root ${HADOOP_PREFIX}
