Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge -r 1171908:1171909 from trunk onto branch-0.23. Fixes HADOOP-7633. 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1171911 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Devaraj Das 2011-09-17 06:08:50 +00:00
parent 9146f43c8d
commit 148b5eeaa1
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-common-project/hadoop-common/CHANGES.txt
View File

@ -582,6 +582,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

3
hadoop-common-project/hadoop-common/src/main/packages/hadoop-setup-conf.sh
View File

@ -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