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 2010/08/11 20:14:39 UTC
svn commit: r984504 - in /couchdb/branches/1.0.x: ./ Makefile.am
etc/couchdb/ etc/default/couchdb
Author: nslater
Date: Wed Aug 11 18:14:39 2010
New Revision: 984504
URL: http://svn.apache.org/viewvc?rev=984504&view=rev
Log:
merged r984501 from trunk
Modified:
couchdb/branches/1.0.x/ (props changed)
couchdb/branches/1.0.x/Makefile.am
couchdb/branches/1.0.x/etc/couchdb/ (props changed)
couchdb/branches/1.0.x/etc/default/couchdb (props changed)
Propchange: couchdb/branches/1.0.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Aug 11 18:14:39 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:984170,984178,984214,984228,984237,984241
+/couchdb/trunk:984170,984178,984214,984228,984237,984241,984501
Modified: couchdb/branches/1.0.x/Makefile.am
URL: http://svn.apache.org/viewvc/couchdb/branches/1.0.x/Makefile.am?rev=984504&r1=984503&r2=984504&view=diff
==============================================================================
--- couchdb/branches/1.0.x/Makefile.am (original)
+++ couchdb/branches/1.0.x/Makefile.am Wed Aug 11 18:14:39 2010
@@ -109,6 +109,8 @@ install-data-hook:
@echo "You have installed Apache CouchDB, time to relax."
distclean-local:
+ rm -fr $(top_builddir)/etc/couchdb/default.d
+ rm -fr $(top_builddir)/etc/couchdb/local.d
rm -fr $(top_builddir)/tmp
.PHONY: local-clean
Propchange: couchdb/branches/1.0.x/etc/couchdb/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Aug 11 18:14:39 2010
@@ -1,6 +1,8 @@
Makefile
Makefile.in
-default.ini
default_dev.ini
+default.d
+default.ini
default.ini.tpl
local_dev.ini
+local.d
Propchange: couchdb/branches/1.0.x/etc/default/couchdb
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Aug 11 18:14:39 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:984170,984178,984214,984228,984237,984241
+/couchdb/trunk/etc/default/couchdb:984170,984178,984214,984228,984237,984241,984501
/incubator/couchdb/trunk/etc/default/couchdb:642419-694440