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:46:33 UTC
svn commit: r764880 - in /couchdb/branches/0.9.x: ./ AUTHORS
etc/default/couchdb
Author: nslater
Date: Tue Apr 14 16:46:33 2009
New Revision: 764880
URL: http://svn.apache.org/viewvc?rev=764880&view=rev
Log:
merged r762016 from trunk
Modified:
couchdb/branches/0.9.x/ (props changed)
couchdb/branches/0.9.x/AUTHORS
couchdb/branches/0.9.x/etc/default/couchdb (props changed)
Propchange: couchdb/branches/0.9.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 14 16:46:33 2009
@@ -1,3 +1,3 @@
/couchdb/branches/design_resources:751716-751803
/couchdb/branches/form:729440-730015
-/couchdb/trunk:758717,760442,760503,760532,760535,760537-760539,761343,761347-761348,761352-761353,761355
+/couchdb/trunk:758717,760442,760503,760532,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016
Modified: couchdb/branches/0.9.x/AUTHORS
URL: http://svn.apache.org/viewvc/couchdb/branches/0.9.x/AUTHORS?rev=764880&r1=764879&r2=764880&view=diff
==============================================================================
--- couchdb/branches/0.9.x/AUTHORS (original)
+++ couchdb/branches/0.9.x/AUTHORS Tue Apr 14 16:46:33 2009
@@ -10,6 +10,6 @@
* Christopher Lenz <cm...@apache.org>
* J. Chris Anderson <jc...@apache.org>
* Paul Joseph Davis <da...@apache.org>
- * Adam Kocoloski <ad...@gmail.com>
+ * Adam Kocoloski <ko...@apache.org>
For a list of other credits see the `THANKS` file.
Propchange: couchdb/branches/0.9.x/etc/default/couchdb
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 14 16:46:33 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-760539,761343,761347-761348,761352-761353,761355
+/couchdb/trunk/etc/default/couchdb:758717,760442,760503,760532,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016
/incubator/couchdb/trunk/etc/default/couchdb:642419-694440