Return-Path: X-Original-To: apmail-hadoop-common-commits-archive@www.apache.org Delivered-To: apmail-hadoop-common-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 424DC8BE1 for ; Sat, 17 Sep 2011 04:47:01 +0000 (UTC) Received: (qmail 26061 invoked by uid 500); 17 Sep 2011 04:47:00 -0000 Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org Received: (qmail 26026 invoked by uid 500); 17 Sep 2011 04:47:00 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: common-dev@hadoop.apache.org Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 26003 invoked by uid 99); 17 Sep 2011 04:46:59 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 17 Sep 2011 04:46:59 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 17 Sep 2011 04:46:57 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 1008D23888E4 for ; Sat, 17 Sep 2011 04:46:36 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1171891 - in /hadoop/common/branches/branch-0.20-security: CHANGES.txt src/packages/rpm/spec/hadoop.spec Date: Sat, 17 Sep 2011 04:46:35 -0000 To: common-commits@hadoop.apache.org From: ddas@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20110917044636.1008D23888E4@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: ddas Date: Sat Sep 17 04:46:34 2011 New Revision: 1171891 URL: http://svn.apache.org/viewvc?rev=1171891&view=rev Log: HADOOP-7637. Fix to include FairScheduler configuration file in RPM. Contributed by Eric Yang. Modified: hadoop/common/branches/branch-0.20-security/CHANGES.txt hadoop/common/branches/branch-0.20-security/src/packages/rpm/spec/hadoop.spec Modified: hadoop/common/branches/branch-0.20-security/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security/CHANGES.txt?rev=1171891&r1=1171890&r2=1171891&view=diff ============================================================================== --- hadoop/common/branches/branch-0.20-security/CHANGES.txt (original) +++ hadoop/common/branches/branch-0.20-security/CHANGES.txt Sat Sep 17 04:46:34 2011 @@ -178,6 +178,9 @@ Release 0.20.205.0 - unreleased HADOOP-7644. Fix TestDelegationTokenRenewal and TestDelegationTokenFetcher to use and test the new style renewers. (omalley) + HADOOP-7637. Fix to include FairScheduler configuration file in + RPM. (Eric Yang via ddas) + IMPROVEMENTS MAPREDUCE-2187. Reporter sends progress during sort/merge. (Anupam Seth via Modified: hadoop/common/branches/branch-0.20-security/src/packages/rpm/spec/hadoop.spec URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security/src/packages/rpm/spec/hadoop.spec?rev=1171891&r1=1171890&r2=1171891&view=diff ============================================================================== --- hadoop/common/branches/branch-0.20-security/src/packages/rpm/spec/hadoop.spec (original) +++ hadoop/common/branches/branch-0.20-security/src/packages/rpm/spec/hadoop.spec Sat Sep 17 04:46:34 2011 @@ -190,6 +190,7 @@ bash ${RPM_INSTALL_PREFIX0}/sbin/update- %config(noreplace) %{_conf_dir}/ssl-client.xml.example %config(noreplace) %{_conf_dir}/ssl-server.xml.example %config(noreplace) %{_conf_dir}/taskcontroller.cfg +%config(noreplace) %{_conf_dir}/fair-scheduler.xml %{_prefix} %attr(0755,root,root) %{_prefix}/libexec %attr(0755,root,root) /etc/rc.d/init.d