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 00:22:01 UTC
svn commit: r984242 - in /couchdb/branches/1.0.x: ./ etc/default/couchdb m4/
src/couchdb/priv/
Author: nslater
Date: Tue Aug 10 22:22:01 2010
New Revision: 984242
URL: http://svn.apache.org/viewvc?rev=984242&view=rev
Log:
backported r984241
Modified:
couchdb/branches/1.0.x/ (props changed)
couchdb/branches/1.0.x/etc/default/couchdb (props changed)
couchdb/branches/1.0.x/m4/ (props changed)
couchdb/branches/1.0.x/src/couchdb/priv/ (props changed)
Propchange: couchdb/branches/1.0.x/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Tue Aug 10 22:22:01 2010
@@ -5,6 +5,7 @@ Makefile
Makefile.in
acinclude.m4
aclocal.m4
+apache-couchdb-*
autom4te.cache
build-aux
config.h
Propchange: couchdb/branches/1.0.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug 10 22:22:01 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
+/couchdb/trunk:984170,984178,984214,984228,984237,984241
Propchange: couchdb/branches/1.0.x/etc/default/couchdb
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug 10 22:22:01 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
+/couchdb/trunk/etc/default/couchdb:984170,984178,984214,984228,984237,984241
/incubator/couchdb/trunk/etc/default/couchdb:642419-694440
Propchange: couchdb/branches/1.0.x/m4/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Tue Aug 10 22:22:01 2010
@@ -1,2 +1,7 @@
ac_check_curl.m4
ac_check_icu.m4
+ltsugar.m4
+libtool.m4
+ltversion.m4
+lt~obsolete.m4
+ltoptions.m4
Propchange: couchdb/branches/1.0.x/src/couchdb/priv/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Tue Aug 10 22:22:01 2010
@@ -1,4 +1,5 @@
.deps
+.libs
Makefile.in
Makefile
couchjs