Author: nslater
Date: Tue Aug 10 19:14:05 2010
New Revision: 984175
URL: http://svn.apache.org/viewvc?rev=984175&view=rev
Log:
backported r984170
Removed:
couchdb/branches/1.0.x/etc/couchdb/default.d/
couchdb/branches/1.0.x/etc/couchdb/local.d/
Modified:
couchdb/branches/1.0.x/ (props changed)
couchdb/branches/1.0.x/etc/default/couchdb (props changed)
Propchange: couchdb/branches/1.0.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug 10 19:14:05 2010
@@ -6,3 +6,4 @@
/couchdb/branches/list-iterator:782292-784593
/couchdb/branches/tail_header:775760-778477
/couchdb/tags/0.10.0:825400
+/couchdb/trunk:984170
Propchange: couchdb/branches/1.0.x/etc/default/couchdb
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug 10 19:14:05 2010
@@ -6,4 +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:984170
/incubator/couchdb/trunk/etc/default/couchdb:642419-694440
