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:35:58 UTC
svn commit: r764867 - in /couchdb/branches/0.9.x: ./ bootstrap build-aux/
etc/default/couchdb
Author: nslater
Date: Tue Apr 14 16:35:57 2009
New Revision: 764867
URL: http://svn.apache.org/viewvc?rev=764867&view=rev
Log:
merged r760503 from trunk
Removed:
couchdb/branches/0.9.x/build-aux/
Modified:
couchdb/branches/0.9.x/ (props changed)
couchdb/branches/0.9.x/bootstrap
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:35:57 2009
@@ -1,3 +1,3 @@
/couchdb/branches/design_resources:751716-751803
/couchdb/branches/form:729440-730015
-/couchdb/trunk:758717,760442
+/couchdb/trunk:758717,760442,760503
Modified: couchdb/branches/0.9.x/bootstrap
URL: http://svn.apache.org/viewvc/couchdb/branches/0.9.x/bootstrap?rev=764867&r1=764866&r2=764867&view=diff
==============================================================================
--- couchdb/branches/0.9.x/bootstrap (original)
+++ couchdb/branches/0.9.x/bootstrap Tue Apr 14 16:35:57 2009
@@ -29,6 +29,8 @@
rm -f acinclude.m4.tmp
}
+mkdir -p build-aux
+
if test -z "$REVISION"; then
REVISION=`\`which svn\` info . 2> /dev/null | awk "/Revision:/{print \\$2}"`
fi
Propchange: couchdb/branches/0.9.x/etc/default/couchdb
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 14 16:35:57 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
+/couchdb/trunk/etc/default/couchdb:758717,760442,760503
/incubator/couchdb/trunk/etc/default/couchdb:642419-694440