Author: ddas
Date: Sat Sep 17 06:06:21 2011
New Revision: 1171909
URL: http://svn.apache.org/viewvc?rev=1171909&view=rev
Log:
HADOOP-7633. Adds log4j.properties to the hadoop-conf dir on deploy.
Contributed by Eric Yang.
Modified:
hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/packages/hadoop-setup-conf.sh
Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1171909&r1=1171908&r2=1171909&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt
(original)
+++ hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt Sat Sep
17 06:06:21 2011
@@ -597,6 +597,9 @@ Release 0.23.0 - Unreleased
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)
+
Release 0.22.0 - Unreleased
INCOMPATIBLE CHANGES
Modified:
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/packages/hadoop-setup-conf.sh
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/packages/hadoop-setup-conf.sh?rev=1171909&r1=1171908&r2=1171909&view=diff
==============================================================================
---
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/packages/hadoop-setup-conf.sh
(original)
+++
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/packages/hadoop-setup-conf.sh
Sat Sep 17 06:06:21 2011
@@ -477,6 +477,9 @@ else
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/common/templates/conf/log4j.properties
${HADOOP_CONF_DIR}/log4j.properties
+ fi
chown root:${HADOOP_GROUP} ${HADOOP_CONF_DIR}/hadoop-env.sh
chmod 755 ${HADOOP_CONF_DIR}/hadoop-env.sh
