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

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

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