From 9a11a3a0b35f566ac7fcd5b00698f2a35749ded5 Mon Sep 17 00:00:00 2001 From: Devaraj Das Date: Sat, 17 Sep 2011 05:07:46 +0000 Subject: [PATCH] HADOOP-7637. Fix to include FairScheduler configuration file in RPM. Contributed by Eric Yang. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1171894 13f79535-47bb-0310-9956-ffa450edef68 --- hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++ .../hadoop-common/src/main/packages/rpm/spec/hadoop.spec | 1 + 2 files changed, 4 insertions(+) diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index c9dc656f66..9641996976 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -594,6 +594,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 33cf8476f1..71c6d27de7 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