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

Merge -r 1171893:1171894 from trunk onto branch-0.23. Fixes HADOOP-7637. 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1171896 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Devaraj Das 2011-09-17 05:10:42 +00:00
parent 25e9ededd2
commit 1d12b70d0e
2 changed files with 4 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

@ -579,6 +579,9 @@ Release 0.23.0 - Unreleased
HADOOP-7608. SnappyCodec check for Hadoop native lib is wrong HADOOP-7608. SnappyCodec check for Hadoop native lib is wrong
(Alejandro Abdelnur via todd) (Alejandro Abdelnur via todd)
HADOOP-7637. Fix to include FairScheduler configuration file in
RPM. (Eric Yang via ddas)
Release 0.22.0 - Unreleased Release 0.22.0 - Unreleased
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

1
hadoop-common-project/hadoop-common/src/main/packages/rpm/spec/hadoop.spec
View File

@ -166,6 +166,7 @@ bash ${RPM_INSTALL_PREFIX0}/sbin/update-hadoop-env.sh \
%config(noreplace) %{_conf_dir}/log4j.properties %config(noreplace) %{_conf_dir}/log4j.properties
%config(noreplace) %{_conf_dir}/masters %config(noreplace) %{_conf_dir}/masters
%config(noreplace) %{_conf_dir}/slaves %config(noreplace) %{_conf_dir}/slaves
%config{noreplace) %{_conf_dir}/fair-scheduler.xml
%{_conf_dir}/hadoop-env.sh.template %{_conf_dir}/hadoop-env.sh.template
%{_conf_dir}/ssl-client.xml.example %{_conf_dir}/ssl-client.xml.example
%{_conf_dir}/ssl-server.xml.example %{_conf_dir}/ssl-server.xml.example