Return-Path: Delivered-To: apmail-couchdb-commits-archive@www.apache.org Received: (qmail 65952 invoked from network); 13 May 2009 13:26:41 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 13 May 2009 13:26:40 -0000 Received: (qmail 80972 invoked by uid 500); 13 May 2009 13:26:40 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 80916 invoked by uid 500); 13 May 2009 13:26:40 -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 80907 invoked by uid 99); 13 May 2009 13:26:40 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 13 May 2009 13:26:40 +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; Wed, 13 May 2009 13:26:30 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id BCFCA2388874; Wed, 13 May 2009 13:26:10 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r774353 - in /couchdb/branches/0.9.x: ./ configure.ac etc/default/couchdb Date: Wed, 13 May 2009 13:26:10 -0000 To: commits@couchdb.apache.org From: jan@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090513132610.BCFCA2388874@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: jan Date: Wed May 13 13:26:10 2009 New Revision: 774353 URL: http://svn.apache.org/viewvc?rev=774353&view=rev Log: merged r773225 from trunk Modified: couchdb/branches/0.9.x/ (props changed) couchdb/branches/0.9.x/configure.ac couchdb/branches/0.9.x/etc/default/couchdb (props changed) Propchange: couchdb/branches/0.9.x/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed May 13 13:26:10 2009 @@ -1,3 +1,3 @@ /couchdb/branches/design_resources:751716-751803 /couchdb/branches/form:729440-730015 -/couchdb/trunk:758717,758723,758768,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762019,762153,762574,763816,763818,763833,764257,764835,765419-765420,765479,765819,766347,766353,766358,766373,766383,766390,766392,766399,766406-766407,766456,766467,766476,766493,766505-766506,766751,767164,767175-767176,767190,767204,767206,767208,767362,767398,767543,768573,769109,769127,769181,769211,769792,769804,770782,771418,771466,771472,772406,772415,772978,773260,773319,773387,773401,774045,774095,774101,774180-774181 +/couchdb/trunk:758717,758723,758768,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762019,762153,762574,763816,763818,763833,764257,764835,765419-765420,765479,765819,766347,766353,766358,766373,766383,766390,766392,766399,766406-766407,766456,766467,766476,766493,766505-766506,766751,767164,767175-767176,767190,767204,767206,767208,767362,767398,767543,768573,769109,769127,769181,769211,769792,769804,770782,771418,771466,771472,772406,772415,772978,773225,773260,773319,773387,773401,774045,774095,774101,774180-774181 Modified: couchdb/branches/0.9.x/configure.ac URL: http://svn.apache.org/viewvc/couchdb/branches/0.9.x/configure.ac?rev=774353&r1=774352&r2=774353&view=diff ============================================================================== --- couchdb/branches/0.9.x/configure.ac (original) +++ couchdb/branches/0.9.x/configure.ac Wed May 13 13:26:10 2009 @@ -279,4 +279,4 @@ echo echo "You have configured Apache CouchDB, time to relax." echo -echo "Run \`make && make install' to install." +echo "Run \`make && sudo make install' to install." Propchange: couchdb/branches/0.9.x/etc/default/couchdb ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed May 13 13:26:10 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,758723,758768,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762019,762153,762574,763816,763818,763833,764257,764835,765419-765420,765479,765819,766347,766353,766358,766373,766383,766390,766392,766399,766406-766407,766456,766467,766476,766493,766505-766506,766751,767164,767175-767176,767190,767204,767206,767208,767362,767398,767543,768573,769109,769127,769181,769211,769792,769804,770782,771418,771466,771472,772406,772415,772978,773260,773319,773387,773401,774045,774095,774101,774180-774181 +/couchdb/trunk/etc/default/couchdb:758717,758723,758768,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762019,762153,762574,763816,763818,763833,764257,764835,765419-765420,765479,765819,766347,766353,766358,766373,766383,766390,766392,766399,766406-766407,766456,766467,766476,766493,766505-766506,766751,767164,767175-767176,767190,767204,767206,767208,767362,767398,767543,768573,769109,769127,769181,769211,769792,769804,770782,771418,771466,771472,772406,772415,772978,773225,773260,773319,773387,773401,774045,774095,774101,774180-774181 /incubator/couchdb/trunk/etc/default/couchdb:642419-694440