diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index 3ea56ecfa26..4415971b6b3 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -579,6 +579,9 @@ Release 0.23.0 - Unreleased HADOOP-7608. SnappyCodec check for Hadoop native lib is wrong (Alejandro Abdelnur via todd) + HADOOP-7637. Fix to include FairScheduler configuration file in + RPM. (Eric Yang via ddas) + Release 0.22.0 - Unreleased INCOMPATIBLE CHANGES diff --git a/hadoop-common-project/hadoop-common/src/main/packages/rpm/spec/hadoop.spec b/hadoop-common-project/hadoop-common/src/main/packages/rpm/spec/hadoop.spec index 33cf8476f17..71c6d27de79 100644 --- a/hadoop-common-project/hadoop-common/src/main/packages/rpm/spec/hadoop.spec +++ b/hadoop-common-project/hadoop-common/src/main/packages/rpm/spec/hadoop.spec @@ -166,6 +166,7 @@ bash ${RPM_INSTALL_PREFIX0}/sbin/update-hadoop-env.sh \ %config(noreplace) %{_conf_dir}/log4j.properties %config(noreplace) %{_conf_dir}/masters %config(noreplace) %{_conf_dir}/slaves +%config{noreplace) %{_conf_dir}/fair-scheduler.xml %{_conf_dir}/hadoop-env.sh.template %{_conf_dir}/ssl-client.xml.example %{_conf_dir}/ssl-server.xml.example