Author: ddas
Date: Sat Sep 17 05:10:42 2011
New Revision: 1171896
URL: http://svn.apache.org/viewvc?rev=1171896&view=rev
Log:
Merge -r 1171893:1171894 from trunk onto branch-0.23. Fixes HADOOP-7637.
Modified:
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt
(contents, props changed)
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/packages/rpm/spec/hadoop.spec
Modified:
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1171896&r1=1171895&r2=1171896&view=diff
==============================================================================
---
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt
(original)
+++
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt
Sat Sep 17 05:10:42 2011
@@ -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
Propchange:
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Sep 17 05:10:42 2011
@@ -1,5 +1,5 @@
/hadoop/common/branches/yahoo-merge/CHANGES.txt:1079157,1079163-1079164,1079167
-/hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt:1161777,1161781,1162008,1162188,1162421,1162491,1162499,1162613,1162928,1162954,1162979,1163050,1163069,1163456,1163465,1163490,1163768,1163852,1163858,1164255,1164301,1166402,1167383,1169986,1170046,1170379,1170459,1171297
+/hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt:1161777,1161781,1162008,1162188,1162421,1162491,1162499,1162613,1162928,1162954,1162979,1163050,1163069,1163456,1163465,1163490,1163768,1163852,1163858,1164255,1164301,1166402,1167383,1169986,1170046,1170379,1170459,1171297,1171894
/hadoop/core/branches/branch-0.18/CHANGES.txt:727226
/hadoop/core/branches/branch-0.19/CHANGES.txt:713112
/hadoop/core/trunk/CHANGES.txt:776175-785643,785929-786278
Modified:
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/packages/rpm/spec/hadoop.spec
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/packages/rpm/spec/hadoop.spec?rev=1171896&r1=1171895&r2=1171896&view=diff
==============================================================================
---
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/packages/rpm/spec/hadoop.spec
(original)
+++
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/packages/rpm/spec/hadoop.spec
Sat Sep 17 05:10:42 2011
@@ -166,6 +166,7 @@ bash ${RPM_INSTALL_PREFIX0}/sbin/update-
%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
