From commits-return-4926-apmail-couchdb-commits-archive=couchdb.apache.org@couchdb.apache.org Tue Aug 10 21:25:08 2010 Return-Path: Delivered-To: apmail-couchdb-commits-archive@www.apache.org Received: (qmail 90871 invoked from network); 10 Aug 2010 21:25:08 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 10 Aug 2010 21:25:08 -0000 Received: (qmail 78470 invoked by uid 500); 10 Aug 2010 21:25:08 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 78417 invoked by uid 500); 10 Aug 2010 21:25:08 -0000 Mailing-List: contact commits-help@couchdb.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@couchdb.apache.org Delivered-To: mailing list commits@couchdb.apache.org Received: (qmail 78409 invoked by uid 99); 10 Aug 2010 21:25:08 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 10 Aug 2010 21:25:08 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.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; Tue, 10 Aug 2010 21:25:06 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 252B023889EB; Tue, 10 Aug 2010 21:23:47 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r984216 - in /couchdb/branches/0.11.x: ./ etc/Makefile.am etc/default/couchdb Date: Tue, 10 Aug 2010 21:23:47 -0000 To: commits@couchdb.apache.org From: nslater@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100810212347.252B023889EB@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: nslater Date: Tue Aug 10 21:23:46 2010 New Revision: 984216 URL: http://svn.apache.org/viewvc?rev=984216&view=rev Log: backported r984214 Modified: couchdb/branches/0.11.x/ (props changed) couchdb/branches/0.11.x/etc/Makefile.am couchdb/branches/0.11.x/etc/default/couchdb (props changed) Propchange: couchdb/branches/0.11.x/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Aug 10 21:23:46 2010 @@ -6,4 +6,4 @@ /couchdb/branches/list-iterator:782292-784593 /couchdb/branches/tail_header:775760-778477 /couchdb/tags/0.10.0:825400 -/couchdb/trunk:909247,910054,910696,910910-910911,911544,911559,911578,911602,911717,911837,912474,912606,912608,912615,912636,915526,915529-915530,915827,916076,916153,916518,916521,917553,918855,919193,921707,923526,925264,931655,933039,936889,941451,946400,955000,984170,984178 +/couchdb/trunk:909247,910054,910696,910910-910911,911544,911559,911578,911602,911717,911837,912474,912606,912608,912615,912636,915526,915529-915530,915827,916076,916153,916518,916521,917553,918855,919193,921707,923526,925264,931655,933039,936889,941451,946400,955000,984170,984178,984214 Modified: couchdb/branches/0.11.x/etc/Makefile.am URL: http://svn.apache.org/viewvc/couchdb/branches/0.11.x/etc/Makefile.am?rev=984216&r1=984215&r2=984216&view=diff ============================================================================== --- couchdb/branches/0.11.x/etc/Makefile.am (original) +++ couchdb/branches/0.11.x/etc/Makefile.am Tue Aug 10 21:23:46 2010 @@ -25,10 +25,15 @@ endif nobase_sysconf_DATA = $(default_sysconf_data) $(init_sysconf_data) -EXTRA_DIST = default/couchdb +EXTRA_DIST = \ + default/couchdb \ + windows/couchdb.iss.tpl \ + windows/README.txt.tpl if WINDOWS -EXTRA_DIST += windows/setup-couchdb-@version@.exe.md5 windows/setup-couchdb-@version@.exe.sha +EXTRA_DIST += \ + windows/setup-couchdb-@version@.exe.md5 \ + windows/setup-couchdb-@version@.exe.sha endif CLEANFILES = $(init_DATA) $(default_sysconf_data) $(launchd_DATA) Propchange: couchdb/branches/0.11.x/etc/default/couchdb ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Aug 10 21:23:46 2010 @@ -6,5 +6,5 @@ /couchdb/branches/list-iterator/etc/default/couchdb:782292-784593 /couchdb/branches/tail_header/etc/default/couchdb:775760-778477 /couchdb/tags/0.10.0/etc/default/couchdb:825400 -/couchdb/trunk/etc/default/couchdb:909247,910054,910696,911544,911602,911717,911837,912474,912606,912608,912615,912636,915526,915529-915530,915827,916076,916153,916518,916521,917553,918855,919193,921707,923526,925264,931655,933039,936889,941451,946400,955000,984170,984178 +/couchdb/trunk/etc/default/couchdb:909247,910054,910696,911544,911602,911717,911837,912474,912606,912608,912615,912636,915526,915529-915530,915827,916076,916153,916518,916521,917553,918855,919193,921707,923526,925264,931655,933039,936889,941451,946400,955000,984170,984178,984214 /incubator/couchdb/trunk/etc/default/couchdb:642419-694440