svn commit: r1171905 - in /hadoop/common/branches/branch-0.20-security: CHANGES.txt src/packages/hadoop-setup-conf.sh

[ddas]

Author: ddas
Date: Sat Sep 17 05:58:28 2011
New Revision: 1171905

URL: http://svn.apache.org/viewvc?rev=1171905&view=rev
Log:
HADOOP-7633. Adds log4j.properties to the hadoop-conf dir on deploy. 
Contributed by Eric Yang.

Modified:
    hadoop/common/branches/branch-0.20-security/CHANGES.txt
    
hadoop/common/branches/branch-0.20-security/src/packages/hadoop-setup-conf.sh

Modified: hadoop/common/branches/branch-0.20-security/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security/CHANGES.txt?rev=1171905&r1=1171904&r2=1171905&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security/CHANGES.txt (original)
+++ hadoop/common/branches/branch-0.20-security/CHANGES.txt Sat Sep 17 05:58:28 
2011
@@ -181,6 +181,9 @@ Release 0.20.205.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)
+
   IMPROVEMENTS
 
     MAPREDUCE-2187. Reporter sends progress during sort/merge. (Anupam Seth via

Modified: 
hadoop/common/branches/branch-0.20-security/src/packages/hadoop-setup-conf.sh
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security/src/packages/hadoop-setup-conf.sh?rev=1171905&r1=1171904&r2=1171905&view=diff
==============================================================================
--- 
hadoop/common/branches/branch-0.20-security/src/packages/hadoop-setup-conf.sh 
(original)
+++ 
hadoop/common/branches/branch-0.20-security/src/packages/hadoop-setup-conf.sh 
Sat Sep 17 05:58:28 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}