couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nsla...@apache.org
Subject svn commit: r984503 - in /couchdb/branches/0.11.x: ./ Makefile.am etc/couchdb/ etc/default/couchdb
Date Wed, 11 Aug 2010 18:14:08 GMT
Author: nslater
Date: Wed Aug 11 18:14:07 2010
New Revision: 984503

URL: http://svn.apache.org/viewvc?rev=984503&view=rev
Log:
merged r984501 from trunk

Modified:
    couchdb/branches/0.11.x/   (props changed)
    couchdb/branches/0.11.x/Makefile.am
    couchdb/branches/0.11.x/etc/couchdb/   (props changed)
    couchdb/branches/0.11.x/etc/default/couchdb   (props changed)

Propchange: couchdb/branches/0.11.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Aug 11 18:14:07 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:909247,910054,910696,910910-910911,911544,911559,911578,911602,911717,911837,912474,912606,912608,912615,912636,915526,915529-915530,915827,916076,916153,916518,916521,917553,918855,919193,921707,923526,925264,931655,933039,936889,941451,946400,955000,984170,984178,984214,984228,984237,984241
+/couchdb/trunk:909247,910054,910696,910910-910911,911544,911559,911578,911602,911717,911837,912474,912606,912608,912615,912636,915526,915529-915530,915827,916076,916153,916518,916521,917553,918855,919193,921707,923526,925264,931655,933039,936889,941451,946400,955000,984170,984178,984214,984228,984237,984241,984501

Modified: couchdb/branches/0.11.x/Makefile.am
URL: http://svn.apache.org/viewvc/couchdb/branches/0.11.x/Makefile.am?rev=984503&r1=984502&r2=984503&view=diff
==============================================================================
--- couchdb/branches/0.11.x/Makefile.am (original)
+++ couchdb/branches/0.11.x/Makefile.am Wed Aug 11 18:14:07 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/0.11.x/etc/couchdb/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Aug 11 18:14:07 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/0.11.x/etc/default/couchdb
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Aug 11 18:14:07 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:909247,910054,910696,911544,911602,911717,911837,912474,912606,912608,912615,912636,915526,915529-915530,915827,916076,916153,916518,916521,917553,918855,919193,921707,923526,925264,931655,933039,936889,941451,946400,955000,984170,984178,984214,984228,984237,984241
+/couchdb/trunk/etc/default/couchdb:909247,910054,910696,911544,911602,911717,911837,912474,912606,912608,912615,912636,915526,915529-915530,915827,916076,916153,916518,916521,917553,918855,919193,921707,923526,925264,931655,933039,936889,941451,946400,955000,984170,984178,984214,984228,984237,984241,984501
 /incubator/couchdb/trunk/etc/default/couchdb:642419-694440



Mime
View raw message