You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by ns...@apache.org on 2009/04/14 18:40:25 UTC
svn commit: r764872 - in /couchdb/branches/0.9.x: ./ etc/default/couchdb
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