Return-Path: Delivered-To: apmail-couchdb-commits-archive@www.apache.org Received: (qmail 46894 invoked from network); 14 Apr 2009 16:40:47 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 14 Apr 2009 16:40:47 -0000 Received: (qmail 82500 invoked by uid 500); 14 Apr 2009 16:40:46 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 82419 invoked by uid 500); 14 Apr 2009 16:40:46 -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 82410 invoked by uid 99); 14 Apr 2009 16:40:46 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 14 Apr 2009 16:40:46 +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, 14 Apr 2009 16:40:45 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 7BFF22388AFF; Tue, 14 Apr 2009 16:40:25 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r764872 - in /couchdb/branches/0.9.x: ./ etc/default/couchdb Date: Tue, 14 Apr 2009 16:40:25 -0000 To: commits@couchdb.apache.org From: nslater@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090414164025.7BFF22388AFF@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: nslater Date: Tue Apr 14 16:40:24 2009 New Revision: 764872 URL: http://svn.apache.org/viewvc?rev=764872&view=rev Log: merged r760539 from trunk Modified: couchdb/branches/0.9.x/ (props changed) couchdb/branches/0.9.x/etc/default/couchdb (props changed) Propchange: couchdb/branches/0.9.x/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Tue Apr 14 16:40:24 2009 @@ -6,6 +6,7 @@ acinclude.m4 aclocal.m4 autom4te.cache +build-aux config.h config.h.in config.log Propchange: couchdb/branches/0.9.x/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Apr 14 16:40:24 2009 @@ -1,3 +1,3 @@ /couchdb/branches/design_resources:751716-751803 /couchdb/branches/form:729440-730015 -/couchdb/trunk:758717,760442,760503,760532,760535,760537-760538 +/couchdb/trunk:758717,760442,760503,760532,760535,760537-760539 Propchange: couchdb/branches/0.9.x/etc/default/couchdb ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Apr 14 16:40:24 2009 @@ -1,4 +1,4 @@ /couchdb/branches/design_resources/etc/default/couchdb:751716-751803 /couchdb/branches/form/etc/default/couchdb:729440-730015 -/couchdb/trunk/etc/default/couchdb:758717,760442,760503,760532,760535,760537-760538 +/couchdb/trunk/etc/default/couchdb:758717,760442,760503,760532,760535,760537-760539 /incubator/couchdb/trunk/etc/default/couchdb:642419-694440