date:20090513

svn commit: r774296 - in /couchdb/branches/0.9.x: ./ etc/default/couchdb share/www/script/test/show_documents.js

2009-05-13 Thread jan

Author: jan
Date: Wed May 13 12:46:16 2009
New Revision: 774296

URL: http://svn.apache.org/viewvc?rev=774296view=rev
Log:
blocked r774045 and r774095 from trunk

Modified:
couchdb/branches/0.9.x/   (props changed)
couchdb/branches/0.9.x/etc/default/couchdb   (props changed)
couchdb/branches/0.9.x/share/www/script/test/show_documents.js

Propchange: couchdb/branches/0.9.x/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 13 12:46:16 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,762016,765420,765479,766347,766353,766358,766373,766505,767398,767543,768573,769109,769127,769804,770782,771472,773260,774180-774181
+/couchdb/trunk:758717,760442,760503,760532,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,765420,765479,766347,766353,766358,766373,766505,767398,767543,768573,769109,769127,769804,770782,771472,773260,774045,774095,774180-774181

Propchange: couchdb/branches/0.9.x/etc/default/couchdb
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 13 12:46:16 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,762016,765420,765479,766347,766353,766358,766373,766505,767398,767543,768573,769109,769127,769804,770782,771472,773260,774180-774181
+/couchdb/trunk/etc/default/couchdb:758717,760442,760503,760532,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,765420,765479,766347,766353,766358,766373,766505,767398,767543,768573,769109,769127,769804,770782,771472,773260,774045,774095,774180-774181
 /incubator/couchdb/trunk/etc/default/couchdb:642419-694440

Modified: couchdb/branches/0.9.x/share/www/script/test/show_documents.js
URL: 
http://svn.apache.org/viewvc/couchdb/branches/0.9.x/share/www/script/test/show_documents.js?rev=774296r1=774295r2=774296view=diff
==
--- couchdb/branches/0.9.x/share/www/script/test/show_documents.js (original)
+++ couchdb/branches/0.9.x/share/www/script/test/show_documents.js Wed May 13 
12:46:16 2009
@@ -33,7 +33,8 @@
 }
   }),
   just-name : stringFun(function(doc, req) {
-if (doc) {
+if (docm
+  
   return {
 body : Just  + doc.name
   };

svn commit: r774302 - in /couchdb/branches/0.9.x: ./ etc/default/couchdb

2009-05-13 Thread jan

Author: jan
Date: Wed May 13 12:50:10 2009
New Revision: 774302

URL: http://svn.apache.org/viewvc?rev=774302view=rev
Log:
blocked r767362 from trunk

Modified:
couchdb/branches/0.9.x/   (props changed)
couchdb/branches/0.9.x/etc/default/couchdb   (props changed)

Propchange: couchdb/branches/0.9.x/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 13 12:50:10 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,762016,765420,765479,766347,766353,766358,766373,766505,767398,767543,768573,769109,769127,769181,769211,769804,770782,771472,773260,774045,774095,774180-774181
+/couchdb/trunk:758717,760442,760503,760532,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,765420,765479,766347,766353,766358,766373,766505,767362,767398,767543,768573,769109,769127,769181,769211,769804,770782,771472,773260,774045,774095,774180-774181

Propchange: couchdb/branches/0.9.x/etc/default/couchdb
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 13 12:50:10 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,762016,765420,765479,766347,766353,766358,766373,766505,767398,767543,768573,769109,769127,769181,769211,769804,770782,771472,773260,774045,774095,774180-774181
+/couchdb/trunk/etc/default/couchdb:758717,760442,760503,760532,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,765420,765479,766347,766353,766358,766373,766505,767362,767398,767543,768573,769109,769127,769181,769211,769804,770782,771472,773260,774045,774095,774180-774181
 /incubator/couchdb/trunk/etc/default/couchdb:642419-694440

svn commit: r774306 - in /couchdb/branches/0.9.x: ./ configure.ac etc/default/couchdb

2009-05-13 Thread jan

Author: jan
Date: Wed May 13 12:58:07 2009
New Revision: 774306

URL: http://svn.apache.org/viewvc?rev=774306view=rev
Log:
mergeed r766493 from trunk

Modified:
couchdb/branches/0.9.x/   (props changed)
couchdb/branches/0.9.x/configure.ac
couchdb/branches/0.9.x/etc/default/couchdb   (props changed)

Propchange: couchdb/branches/0.9.x/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 13 12:58:07 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,762016,765420,765479,766347,766353,766358,766373,766390,766392,766399,766406,766476,766505-766506,766751,767362,767398,767543,768573,769109,769127,769181,769211,769804,770782,771472,773260,774045,774095,774180-774181
+/couchdb/trunk:758717,760442,760503,760532,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,765420,765479,766347,766353,766358,766373,766390,766392,766399,766406,766476,766493,766505-766506,766751,767362,767398,767543,768573,769109,769127,769181,769211,769804,770782,771472,773260,774045,774095,774180-774181

Modified: couchdb/branches/0.9.x/configure.ac
URL: 
http://svn.apache.org/viewvc/couchdb/branches/0.9.x/configure.ac?rev=774306r1=774305r2=774306view=diff
==
--- couchdb/branches/0.9.x/configure.ac (original)
+++ couchdb/branches/0.9.x/configure.ac Wed May 13 12:58:07 2009
@@ -201,8 +201,8 @@
 fi
 fi
 
-AC_ARG_VAR([ERL_EXECUTABLE], [path to the `erl' executable])
-AC_ARG_VAR([ERLC_EXECUTABLE], [path to the `erlc' executable])
+AC_ARG_VAR([ERL], [path to the `erl' executable])
+AC_ARG_VAR([ERLC], [path to the `erlc' executable])
 AC_ARG_VAR([HELP2MAN_EXECUTABLE], [path to the `help2man' program])
 
 if test -n $HELP2MAN_EXECUTABLE; then

Propchange: couchdb/branches/0.9.x/etc/default/couchdb
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 13 12:58:07 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,762016,765420,765479,766347,766353,766358,766373,766390,766392,766399,766406,766476,766505-766506,766751,767362,767398,767543,768573,769109,769127,769181,769211,769804,770782,771472,773260,774045,774095,774180-774181
+/couchdb/trunk/etc/default/couchdb:758717,760442,760503,760532,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,765420,765479,766347,766353,766358,766373,766390,766392,766399,766406,766476,766493,766505-766506,766751,767362,767398,767543,768573,769109,769127,769181,769211,769804,770782,771472,773260,774045,774095,774180-774181
 /incubator/couchdb/trunk/etc/default/couchdb:642419-694440

svn commit: r774307 - in /couchdb/branches/0.9.x: ./ etc/default/couchdb

2009-05-13 Thread jan

Author: jan
Date: Wed May 13 12:58:49 2009
New Revision: 774307

URL: http://svn.apache.org/viewvc?rev=774307view=rev
Log:
blocked r766467 from trunk

Modified:
couchdb/branches/0.9.x/   (props changed)
couchdb/branches/0.9.x/etc/default/couchdb   (props changed)

Propchange: couchdb/branches/0.9.x/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 13 12:58:49 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,762016,765420,765479,766347,766353,766358,766373,766390,766392,766399,766406,766476,766493,766505-766506,766751,767362,767398,767543,768573,769109,769127,769181,769211,769804,770782,771472,773260,774045,774095,774180-774181
+/couchdb/trunk:758717,760442,760503,760532,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,765420,765479,766347,766353,766358,766373,766390,766392,766399,766406,766467,766476,766493,766505-766506,766751,767362,767398,767543,768573,769109,769127,769181,769211,769804,770782,771472,773260,774045,774095,774180-774181

Propchange: couchdb/branches/0.9.x/etc/default/couchdb
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 13 12:58:49 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,762016,765420,765479,766347,766353,766358,766373,766390,766392,766399,766406,766476,766493,766505-766506,766751,767362,767398,767543,768573,769109,769127,769181,769211,769804,770782,771472,773260,774045,774095,774180-774181
+/couchdb/trunk/etc/default/couchdb:758717,760442,760503,760532,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,765420,765479,766347,766353,766358,766373,766390,766392,766399,766406,766467,766476,766493,766505-766506,766751,767362,767398,767543,768573,769109,769127,769181,769211,769804,770782,771472,773260,774045,774095,774180-774181
 /incubator/couchdb/trunk/etc/default/couchdb:642419-694440

svn commit: r774308 - in /couchdb/branches/0.9.x: ./ etc/default/couchdb

2009-05-13 Thread jan

Author: jan
Date: Wed May 13 12:59:32 2009
New Revision: 774308

URL: http://svn.apache.org/viewvc?rev=774308view=rev
Log:
blocked r766456 from trunk

Modified:
couchdb/branches/0.9.x/   (props changed)
couchdb/branches/0.9.x/etc/default/couchdb   (props changed)

Propchange: couchdb/branches/0.9.x/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 13 12:59:32 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,762016,765420,765479,766347,766353,766358,766373,766390,766392,766399,766406,766467,766476,766493,766505-766506,766751,767362,767398,767543,768573,769109,769127,769181,769211,769804,770782,771472,773260,774045,774095,774180-774181
+/couchdb/trunk:758717,760442,760503,760532,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,765420,765479,766347,766353,766358,766373,766390,766392,766399,766406,766456,766467,766476,766493,766505-766506,766751,767362,767398,767543,768573,769109,769127,769181,769211,769804,770782,771472,773260,774045,774095,774180-774181

Propchange: couchdb/branches/0.9.x/etc/default/couchdb
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 13 12:59:32 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,762016,765420,765479,766347,766353,766358,766373,766390,766392,766399,766406,766467,766476,766493,766505-766506,766751,767362,767398,767543,768573,769109,769127,769181,769211,769804,770782,771472,773260,774045,774095,774180-774181
+/couchdb/trunk/etc/default/couchdb:758717,760442,760503,760532,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,765420,765479,766347,766353,766358,766373,766390,766392,766399,766406,766456,766467,766476,766493,766505-766506,766751,767362,767398,767543,768573,769109,769127,769181,769211,769804,770782,771472,773260,774045,774095,774180-774181
 /incubator/couchdb/trunk/etc/default/couchdb:642419-694440

svn commit: r774310 - in /couchdb/branches/0.9.x: ./ etc/default/couchdb

2009-05-13 Thread jan

Author: jan
Date: Wed May 13 13:01:22 2009
New Revision: 774310

URL: http://svn.apache.org/viewvc?rev=774310view=rev
Log:
blocked r764835 from trunk

Modified:
couchdb/branches/0.9.x/   (props changed)
couchdb/branches/0.9.x/etc/default/couchdb   (props changed)

Propchange: couchdb/branches/0.9.x/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 13 13:01:22 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,762016,765420,765479,766347,766353,766358,766373,766390,766392,766399,766406,766456,766467,766476,766493,766505-766506,766751,767362,767398,767543,768573,769109,769127,769181,769211,769804,770782,771472,773260,774045,774095,774180-774181
+/couchdb/trunk:758717,760442,760503,760532,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,764835,765420,765479,766347,766353,766358,766373,766390,766392,766399,766406,766456,766467,766476,766493,766505-766506,766751,767362,767398,767543,768573,769109,769127,769181,769211,769804,770782,771472,773260,774045,774095,774180-774181

Propchange: couchdb/branches/0.9.x/etc/default/couchdb
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 13 13:01:22 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,762016,765420,765479,766347,766353,766358,766373,766390,766392,766399,766406,766456,766467,766476,766493,766505-766506,766751,767362,767398,767543,768573,769109,769127,769181,769211,769804,770782,771472,773260,774045,774095,774180-774181
+/couchdb/trunk/etc/default/couchdb:758717,760442,760503,760532,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,764835,765420,765479,766347,766353,766358,766373,766390,766392,766399,766406,766456,766467,766476,766493,766505-766506,766751,767362,767398,767543,768573,769109,769127,769181,769211,769804,770782,771472,773260,774045,774095,774180-774181
 /incubator/couchdb/trunk/etc/default/couchdb:642419-694440

svn commit: r774311 - in /couchdb/branches/0.9.x: ./ etc/default/couchdb

2009-05-13 Thread jan

Author: jan
Date: Wed May 13 13:02:32 2009
New Revision: 774311

URL: http://svn.apache.org/viewvc?rev=774311view=rev
Log:
blocked r762574 from trunk

Modified:
couchdb/branches/0.9.x/   (props changed)
couchdb/branches/0.9.x/etc/default/couchdb   (props changed)

Propchange: couchdb/branches/0.9.x/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 13 13:02:32 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,762016,764835,765420,765479,766347,766353,766358,766373,766390,766392,766399,766406,766456,766467,766476,766493,766505-766506,766751,767362,767398,767543,768573,769109,769127,769181,769211,769804,770782,771472,773260,774045,774095,774180-774181
+/couchdb/trunk:758717,760442,760503,760532,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762574,764835,765420,765479,766347,766353,766358,766373,766390,766392,766399,766406,766456,766467,766476,766493,766505-766506,766751,767362,767398,767543,768573,769109,769127,769181,769211,769804,770782,771472,773260,774045,774095,774180-774181

Propchange: couchdb/branches/0.9.x/etc/default/couchdb
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 13 13:02:32 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,762016,764835,765420,765479,766347,766353,766358,766373,766390,766392,766399,766406,766456,766467,766476,766493,766505-766506,766751,767362,767398,767543,768573,769109,769127,769181,769211,769804,770782,771472,773260,774045,774095,774180-774181
+/couchdb/trunk/etc/default/couchdb:758717,760442,760503,760532,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762574,764835,765420,765479,766347,766353,766358,766373,766390,766392,766399,766406,766456,766467,766476,766493,766505-766506,766751,767362,767398,767543,768573,769109,769127,769181,769211,769804,770782,771472,773260,774045,774095,774180-774181
 /incubator/couchdb/trunk/etc/default/couchdb:642419-694440

svn commit: r774313 - in /couchdb/branches/0.9.x: ./ etc/default/couchdb

2009-05-13 Thread jan

Author: jan
Date: Wed May 13 13:03:34 2009
New Revision: 774313

URL: http://svn.apache.org/viewvc?rev=774313view=rev
Log:
blocked r759588 from trunk

Modified:
couchdb/branches/0.9.x/   (props changed)
couchdb/branches/0.9.x/etc/default/couchdb   (props changed)

Propchange: couchdb/branches/0.9.x/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 13 13:03:34 2009
@@ -1,3 +1,3 @@
 /couchdb/branches/design_resources:751716-751803
 /couchdb/branches/form:729440-730015
-/couchdb/trunk:758717,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762574,764835,765420,765479,766347,766353,766358,766373,766390,766392,766399,766406,766456,766467,766476,766493,766505-766506,766751,767362,767398,767543,768573,769109,769127,769181,769211,769804,770782,771472,773260,774045,774095,774180-774181
+/couchdb/trunk:758717,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762574,764835,765420,765479,766347,766353,766358,766373,766390,766392,766399,766406,766456,766467,766476,766493,766505-766506,766751,767362,767398,767543,768573,769109,769127,769181,769211,769804,770782,771472,773260,774045,774095,774180-774181

Propchange: couchdb/branches/0.9.x/etc/default/couchdb
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 13 13:03:34 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-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762574,764835,765420,765479,766347,766353,766358,766373,766390,766392,766399,766406,766456,766467,766476,766493,766505-766506,766751,767362,767398,767543,768573,769109,769127,769181,769211,769804,770782,771472,773260,774045,774095,774180-774181
+/couchdb/trunk/etc/default/couchdb:758717,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762574,764835,765420,765479,766347,766353,766358,766373,766390,766392,766399,766406,766456,766467,766476,766493,766505-766506,766751,767362,767398,767543,768573,769109,769127,769181,769211,769804,770782,771472,773260,774045,774095,774180-774181
 /incubator/couchdb/trunk/etc/default/couchdb:642419-694440

svn commit: r774314 - in /couchdb/branches/0.9.x: ./ etc/default/couchdb

2009-05-13 Thread jan

Author: jan
Date: Wed May 13 13:05:12 2009
New Revision: 774314

URL: http://svn.apache.org/viewvc?rev=774314view=rev
Log:
blocked r758942 from trunk

Modified:
couchdb/branches/0.9.x/   (props changed)
couchdb/branches/0.9.x/etc/default/couchdb   (props changed)

Propchange: couchdb/branches/0.9.x/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 13 13:05:12 2009
@@ -1,3 +1,3 @@
 /couchdb/branches/design_resources:751716-751803
 /couchdb/branches/form:729440-730015
-/couchdb/trunk:758717,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762574,764835,765420,765479,766347,766353,766358,766373,766390,766392,766399,766406,766456,766467,766476,766493,766505-766506,766751,767362,767398,767543,768573,769109,769127,769181,769211,769804,770782,771472,773260,774045,774095,774180-774181
+/couchdb/trunk:758717,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762574,764835,765420,765479,766347,766353,766358,766373,766390,766392,766399,766406,766456,766467,766476,766493,766505-766506,766751,767362,767398,767543,768573,769109,769127,769181,769211,769804,770782,771472,773260,774045,774095,774180-774181

Propchange: couchdb/branches/0.9.x/etc/default/couchdb
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 13 13:05:12 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,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762574,764835,765420,765479,766347,766353,766358,766373,766390,766392,766399,766406,766456,766467,766476,766493,766505-766506,766751,767362,767398,767543,768573,769109,769127,769181,769211,769804,770782,771472,773260,774045,774095,774180-774181
+/couchdb/trunk/etc/default/couchdb:758717,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762574,764835,765420,765479,766347,766353,766358,766373,766390,766392,766399,766406,766456,766467,766476,766493,766505-766506,766751,767362,767398,767543,768573,769109,769127,769181,769211,769804,770782,771472,773260,774045,774095,774180-774181
 /incubator/couchdb/trunk/etc/default/couchdb:642419-694440

svn commit: r774315 - in /couchdb/branches/0.9.x: ./ etc/default/couchdb

2009-05-13 Thread jan

Author: jan
Date: Wed May 13 13:05:31 2009
New Revision: 774315

URL: http://svn.apache.org/viewvc?rev=774315view=rev
Log:
blocked r758768 from trunk

Modified:
couchdb/branches/0.9.x/   (props changed)
couchdb/branches/0.9.x/etc/default/couchdb   (props changed)

Propchange: couchdb/branches/0.9.x/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 13 13:05:31 2009
@@ -1,3 +1,3 @@
 /couchdb/branches/design_resources:751716-751803
 /couchdb/branches/form:729440-730015
-/couchdb/trunk:758717,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762574,764835,765420,765479,766347,766353,766358,766373,766390,766392,766399,766406,766456,766467,766476,766493,766505-766506,766751,767362,767398,767543,768573,769109,769127,769181,769211,769804,770782,771472,773260,774045,774095,774180-774181
+/couchdb/trunk:758717,758768,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762574,764835,765420,765479,766347,766353,766358,766373,766390,766392,766399,766406,766456,766467,766476,766493,766505-766506,766751,767362,767398,767543,768573,769109,769127,769181,769211,769804,770782,771472,773260,774045,774095,774180-774181

Propchange: couchdb/branches/0.9.x/etc/default/couchdb
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 13 13:05:31 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,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762574,764835,765420,765479,766347,766353,766358,766373,766390,766392,766399,766406,766456,766467,766476,766493,766505-766506,766751,767362,767398,767543,768573,769109,769127,769181,769211,769804,770782,771472,773260,774045,774095,774180-774181
+/couchdb/trunk/etc/default/couchdb:758717,758768,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762574,764835,765420,765479,766347,766353,766358,766373,766390,766392,766399,766406,766456,766467,766476,766493,766505-766506,766751,767362,767398,767543,768573,769109,769127,769181,769211,769804,770782,771472,773260,774045,774095,774180-774181
 /incubator/couchdb/trunk/etc/default/couchdb:642419-694440

svn commit: r774317 - in /couchdb/branches/0.9.x: ./ etc/default/couchdb

2009-05-13 Thread jan

Author: jan
Date: Wed May 13 13:06:25 2009
New Revision: 774317

URL: http://svn.apache.org/viewvc?rev=774317view=rev
Log:
blocked r758723 from trunk

Modified:
couchdb/branches/0.9.x/   (props changed)
couchdb/branches/0.9.x/etc/default/couchdb   (props changed)

Propchange: couchdb/branches/0.9.x/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 13 13:06:25 2009
@@ -1,3 +1,3 @@
 /couchdb/branches/design_resources:751716-751803
 /couchdb/branches/form:729440-730015
-/couchdb/trunk:758717,758768,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762574,764835,765420,765479,766347,766353,766358,766373,766390,766392,766399,766406,766456,766467,766476,766493,766505-766506,766751,767362,767398,767543,768573,769109,769127,769181,769211,769804,770782,771472,773260,774045,774095,774180-774181
+/couchdb/trunk:758717,758723,758768,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762574,764835,765420,765479,766347,766353,766358,766373,766390,766392,766399,766406,766456,766467,766476,766493,766505-766506,766751,767362,767398,767543,768573,769109,769127,769181,769211,769804,770782,771472,773260,774045,774095,774180-774181

Propchange: couchdb/branches/0.9.x/etc/default/couchdb
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 13 13:06:25 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,758768,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762574,764835,765420,765479,766347,766353,766358,766373,766390,766392,766399,766406,766456,766467,766476,766493,766505-766506,766751,767362,767398,767543,768573,769109,769127,769181,769211,769804,770782,771472,773260,774045,774095,774180-774181
+/couchdb/trunk/etc/default/couchdb:758717,758723,758768,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762574,764835,765420,765479,766347,766353,766358,766373,766390,766392,766399,766406,766456,766467,766476,766493,766505-766506,766751,767362,767398,767543,768573,769109,769127,769181,769211,769804,770782,771472,773260,774045,774095,774180-774181
 /incubator/couchdb/trunk/etc/default/couchdb:642419-694440

svn commit: r774320 - in /couchdb/branches/0.9.x: ./ etc/default/couchdb src/couchdb/couch_httpd.erl

2009-05-13 Thread jan

Author: jan
Date: Wed May 13 13:12:51 2009
New Revision: 774320

URL: http://svn.apache.org/viewvc?rev=774320view=rev
Log:
merged r762019 from trunk

Modified:
couchdb/branches/0.9.x/   (props changed)
couchdb/branches/0.9.x/etc/default/couchdb   (props changed)
couchdb/branches/0.9.x/src/couchdb/couch_httpd.erl

Propchange: couchdb/branches/0.9.x/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 13 13:12:51 2009
@@ -1,3 +1,3 @@
 /couchdb/branches/design_resources:751716-751803
 /couchdb/branches/form:729440-730015
-/couchdb/trunk:758717,758723,758768,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762574,764835,765420,765479,766347,766353,766358,766373,766390,766392,766399,766406,766456,766467,766476,766493,766505-766506,766751,767362,767398,767543,768573,769109,769127,769181,769211,769804,770782,771472,773260,774045,774095,774180-774181
+/couchdb/trunk:758717,758723,758768,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762019,762574,764835,765420,765479,766347,766353,766358,766373,766390,766392,766399,766406,766456,766467,766476,766493,766505-766506,766751,767362,767398,767543,768573,769109,769127,769181,769211,769804,770782,771472,773260,774045,774095,774180-774181

Propchange: couchdb/branches/0.9.x/etc/default/couchdb
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 13 13:12:51 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,758723,758768,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762574,764835,765420,765479,766347,766353,766358,766373,766390,766392,766399,766406,766456,766467,766476,766493,766505-766506,766751,767362,767398,767543,768573,769109,769127,769181,769211,769804,770782,771472,773260,774045,774095,774180-774181
+/couchdb/trunk/etc/default/couchdb:758717,758723,758768,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762019,762574,764835,765420,765479,766347,766353,766358,766373,766390,766392,766399,766406,766456,766467,766476,766493,766505-766506,766751,767362,767398,767543,768573,769109,769127,769181,769211,769804,770782,771472,773260,774045,774095,774180-774181
 /incubator/couchdb/trunk/etc/default/couchdb:642419-694440

Modified: couchdb/branches/0.9.x/src/couchdb/couch_httpd.erl
URL: 
http://svn.apache.org/viewvc/couchdb/branches/0.9.x/src/couchdb/couch_httpd.erl?rev=774320r1=774319r2=774320view=diff
==
--- couchdb/branches/0.9.x/src/couchdb/couch_httpd.erl (original)
+++ couchdb/branches/0.9.x/src/couchdb/couch_httpd.erl Wed May 13 13:12:51 2009
@@ -109,7 +109,7 @@
 
 
 handle_request(MochiReq, UrlHandlers, DbUrlHandlers, DesignUrlHandlers) -
-statistics(runtime), % prepare request_time counter, see end of function
+Begin = now(),
 AuthenticationFun = make_arity_1_fun(
 couch_config:get(httpd, authentication_handler)),
 % for the path, use the raw path with the query string and fragment
@@ -180,7 +180,7 @@
 RawUri,
 Resp:get(code)
 ]),
-{_TotalRuntime, RequestTime} = statistics(runtime),
+RequestTime = round(timer:now_diff(now(), Begin)/1000),
 couch_stats_collector:record({couchdb, request_time}, RequestTime),
 couch_stats_collector:increment({httpd, requests}),
 {ok, Resp}.

svn commit: r774321 - in /couchdb/branches/0.9.x: ./ etc/default/couchdb

2009-05-13 Thread jan

Author: jan
Date: Wed May 13 13:13:11 2009
New Revision: 774321

URL: http://svn.apache.org/viewvc?rev=774321view=rev
Log:
blocked r762153 from trunk

Modified:
couchdb/branches/0.9.x/   (props changed)
couchdb/branches/0.9.x/etc/default/couchdb   (props changed)

Propchange: couchdb/branches/0.9.x/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 13 13:13:11 2009
@@ -1,3 +1,3 @@
 /couchdb/branches/design_resources:751716-751803
 /couchdb/branches/form:729440-730015
-/couchdb/trunk:758717,758723,758768,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762019,762574,764835,765420,765479,766347,766353,766358,766373,766390,766392,766399,766406,766456,766467,766476,766493,766505-766506,766751,767362,767398,767543,768573,769109,769127,769181,769211,769804,770782,771472,773260,774045,774095,774180-774181
+/couchdb/trunk:758717,758723,758768,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762019,762153,762574,764835,765420,765479,766347,766353,766358,766373,766390,766392,766399,766406,766456,766467,766476,766493,766505-766506,766751,767362,767398,767543,768573,769109,769127,769181,769211,769804,770782,771472,773260,774045,774095,774180-774181

Propchange: couchdb/branches/0.9.x/etc/default/couchdb
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 13 13:13:11 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,758723,758768,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762019,762574,764835,765420,765479,766347,766353,766358,766373,766390,766392,766399,766406,766456,766467,766476,766493,766505-766506,766751,767362,767398,767543,768573,769109,769127,769181,769211,769804,770782,771472,773260,774045,774095,774180-774181
+/couchdb/trunk/etc/default/couchdb:758717,758723,758768,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762019,762153,762574,764835,765420,765479,766347,766353,766358,766373,766390,766392,766399,766406,766456,766467,766476,766493,766505-766506,766751,767362,767398,767543,768573,769109,769127,769181,769211,769804,770782,771472,773260,774045,774095,774180-774181
 /incubator/couchdb/trunk/etc/default/couchdb:642419-694440

svn commit: r774322 - in /couchdb/branches/0.9.x: ./ etc/default/couchdb

2009-05-13 Thread jan

Author: jan
Date: Wed May 13 13:13:54 2009
New Revision: 774322

URL: http://svn.apache.org/viewvc?rev=774322view=rev
Log:
blocked r763816 from trunk

Modified:
couchdb/branches/0.9.x/   (props changed)
couchdb/branches/0.9.x/etc/default/couchdb   (props changed)

Propchange: couchdb/branches/0.9.x/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 13 13:13:54 2009
@@ -1,3 +1,3 @@
 /couchdb/branches/design_resources:751716-751803
 /couchdb/branches/form:729440-730015
-/couchdb/trunk:758717,758723,758768,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762019,762153,762574,764835,765420,765479,766347,766353,766358,766373,766390,766392,766399,766406,766456,766467,766476,766493,766505-766506,766751,767362,767398,767543,768573,769109,769127,769181,769211,769804,770782,771472,773260,774045,774095,774180-774181
+/couchdb/trunk:758717,758723,758768,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762019,762153,762574,763816,764835,765420,765479,766347,766353,766358,766373,766390,766392,766399,766406,766456,766467,766476,766493,766505-766506,766751,767362,767398,767543,768573,769109,769127,769181,769211,769804,770782,771472,773260,774045,774095,774180-774181

Propchange: couchdb/branches/0.9.x/etc/default/couchdb
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 13 13:13:54 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,758723,758768,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762019,762153,762574,764835,765420,765479,766347,766353,766358,766373,766390,766392,766399,766406,766456,766467,766476,766493,766505-766506,766751,767362,767398,767543,768573,769109,769127,769181,769211,769804,770782,771472,773260,774045,774095,774180-774181
+/couchdb/trunk/etc/default/couchdb:758717,758723,758768,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762019,762153,762574,763816,764835,765420,765479,766347,766353,766358,766373,766390,766392,766399,766406,766456,766467,766476,766493,766505-766506,766751,767362,767398,767543,768573,769109,769127,769181,769211,769804,770782,771472,773260,774045,774095,774180-774181
 /incubator/couchdb/trunk/etc/default/couchdb:642419-694440

svn commit: r774323 - in /couchdb/branches/0.9.x: ./ etc/default/couchdb

2009-05-13 Thread jan

Author: jan
Date: Wed May 13 13:14:12 2009
New Revision: 774323

URL: http://svn.apache.org/viewvc?rev=774323view=rev
Log:
blocked r763818 from trunk

Modified:
couchdb/branches/0.9.x/   (props changed)
couchdb/branches/0.9.x/etc/default/couchdb   (props changed)

Propchange: couchdb/branches/0.9.x/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 13 13:14:12 2009
@@ -1,3 +1,3 @@
 /couchdb/branches/design_resources:751716-751803
 /couchdb/branches/form:729440-730015
-/couchdb/trunk:758717,758723,758768,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762019,762153,762574,763816,764835,765420,765479,766347,766353,766358,766373,766390,766392,766399,766406,766456,766467,766476,766493,766505-766506,766751,767362,767398,767543,768573,769109,769127,769181,769211,769804,770782,771472,773260,774045,774095,774180-774181
+/couchdb/trunk:758717,758723,758768,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762019,762153,762574,763816,763818,764835,765420,765479,766347,766353,766358,766373,766390,766392,766399,766406,766456,766467,766476,766493,766505-766506,766751,767362,767398,767543,768573,769109,769127,769181,769211,769804,770782,771472,773260,774045,774095,774180-774181

Propchange: couchdb/branches/0.9.x/etc/default/couchdb
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 13 13:14:12 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,758723,758768,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762019,762153,762574,763816,764835,765420,765479,766347,766353,766358,766373,766390,766392,766399,766406,766456,766467,766476,766493,766505-766506,766751,767362,767398,767543,768573,769109,769127,769181,769211,769804,770782,771472,773260,774045,774095,774180-774181
+/couchdb/trunk/etc/default/couchdb:758717,758723,758768,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762019,762153,762574,763816,763818,764835,765420,765479,766347,766353,766358,766373,766390,766392,766399,766406,766456,766467,766476,766493,766505-766506,766751,767362,767398,767543,768573,769109,769127,769181,769211,769804,770782,771472,773260,774045,774095,774180-774181
 /incubator/couchdb/trunk/etc/default/couchdb:642419-694440

svn commit: r774324 - in /couchdb/branches/0.9.x: ./ etc/default/couchdb

2009-05-13 Thread jan

Author: jan
Date: Wed May 13 13:14:37 2009
New Revision: 774324

URL: http://svn.apache.org/viewvc?rev=774324view=rev
Log:
blocked r763833 from trunk

Modified:
couchdb/branches/0.9.x/   (props changed)
couchdb/branches/0.9.x/etc/default/couchdb   (props changed)

Propchange: couchdb/branches/0.9.x/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 13 13:14:37 2009
@@ -1,3 +1,3 @@
 /couchdb/branches/design_resources:751716-751803
 /couchdb/branches/form:729440-730015
-/couchdb/trunk:758717,758723,758768,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762019,762153,762574,763816,763818,764835,765420,765479,766347,766353,766358,766373,766390,766392,766399,766406,766456,766467,766476,766493,766505-766506,766751,767362,767398,767543,768573,769109,769127,769181,769211,769804,770782,771472,773260,774045,774095,774180-774181
+/couchdb/trunk:758717,758723,758768,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762019,762153,762574,763816,763818,763833,764835,765420,765479,766347,766353,766358,766373,766390,766392,766399,766406,766456,766467,766476,766493,766505-766506,766751,767362,767398,767543,768573,769109,769127,769181,769211,769804,770782,771472,773260,774045,774095,774180-774181

Propchange: couchdb/branches/0.9.x/etc/default/couchdb
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 13 13:14:37 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,758723,758768,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762019,762153,762574,763816,763818,764835,765420,765479,766347,766353,766358,766373,766390,766392,766399,766406,766456,766467,766476,766493,766505-766506,766751,767362,767398,767543,768573,769109,769127,769181,769211,769804,770782,771472,773260,774045,774095,774180-774181
+/couchdb/trunk/etc/default/couchdb:758717,758723,758768,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762019,762153,762574,763816,763818,763833,764835,765420,765479,766347,766353,766358,766373,766390,766392,766399,766406,766456,766467,766476,766493,766505-766506,766751,767362,767398,767543,768573,769109,769127,769181,769211,769804,770782,771472,773260,774045,774095,774180-774181
 /incubator/couchdb/trunk/etc/default/couchdb:642419-694440

svn commit: r774325 - in /couchdb/branches/0.9.x: ./ etc/default/couchdb

2009-05-13 Thread jan

Author: jan
Date: Wed May 13 13:14:56 2009
New Revision: 774325

URL: http://svn.apache.org/viewvc?rev=774325view=rev
Log:
blocked r764257 from trunk

Modified:
couchdb/branches/0.9.x/   (props changed)
couchdb/branches/0.9.x/etc/default/couchdb   (props changed)

Propchange: couchdb/branches/0.9.x/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 13 13:14:56 2009
@@ -1,3 +1,3 @@
 /couchdb/branches/design_resources:751716-751803
 /couchdb/branches/form:729440-730015
-/couchdb/trunk:758717,758723,758768,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762019,762153,762574,763816,763818,763833,764835,765420,765479,766347,766353,766358,766373,766390,766392,766399,766406,766456,766467,766476,766493,766505-766506,766751,767362,767398,767543,768573,769109,769127,769181,769211,769804,770782,771472,773260,774045,774095,774180-774181
+/couchdb/trunk:758717,758723,758768,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762019,762153,762574,763816,763818,763833,764257,764835,765420,765479,766347,766353,766358,766373,766390,766392,766399,766406,766456,766467,766476,766493,766505-766506,766751,767362,767398,767543,768573,769109,769127,769181,769211,769804,770782,771472,773260,774045,774095,774180-774181

Propchange: couchdb/branches/0.9.x/etc/default/couchdb
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 13 13:14:56 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,758723,758768,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762019,762153,762574,763816,763818,763833,764835,765420,765479,766347,766353,766358,766373,766390,766392,766399,766406,766456,766467,766476,766493,766505-766506,766751,767362,767398,767543,768573,769109,769127,769181,769211,769804,770782,771472,773260,774045,774095,774180-774181
+/couchdb/trunk/etc/default/couchdb:758717,758723,758768,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762019,762153,762574,763816,763818,763833,764257,764835,765420,765479,766347,766353,766358,766373,766390,766392,766399,766406,766456,766467,766476,766493,766505-766506,766751,767362,767398,767543,768573,769109,769127,769181,769211,769804,770782,771472,773260,774045,774095,774180-774181
 /incubator/couchdb/trunk/etc/default/couchdb:642419-694440

svn commit: r774326 - in /couchdb/branches/0.9.x: ./ etc/default/couchdb

2009-05-13 Thread jan

Author: jan
Date: Wed May 13 13:15:28 2009
New Revision: 774326

URL: http://svn.apache.org/viewvc?rev=774326view=rev
Log:
blocked r765419 from trunk

Modified:
couchdb/branches/0.9.x/   (props changed)
couchdb/branches/0.9.x/etc/default/couchdb   (props changed)

Propchange: couchdb/branches/0.9.x/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 13 13:15:28 2009
@@ -1,3 +1,3 @@
 /couchdb/branches/design_resources:751716-751803
 /couchdb/branches/form:729440-730015
-/couchdb/trunk:758717,758723,758768,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762019,762153,762574,763816,763818,763833,764257,764835,765420,765479,766347,766353,766358,766373,766390,766392,766399,766406,766456,766467,766476,766493,766505-766506,766751,767362,767398,767543,768573,769109,769127,769181,769211,769804,770782,771472,773260,774045,774095,774180-774181
+/couchdb/trunk:758717,758723,758768,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762019,762153,762574,763816,763818,763833,764257,764835,765419-765420,765479,766347,766353,766358,766373,766390,766392,766399,766406,766456,766467,766476,766493,766505-766506,766751,767362,767398,767543,768573,769109,769127,769181,769211,769804,770782,771472,773260,774045,774095,774180-774181

Propchange: couchdb/branches/0.9.x/etc/default/couchdb
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 13 13:15:28 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,758723,758768,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762019,762153,762574,763816,763818,763833,764257,764835,765420,765479,766347,766353,766358,766373,766390,766392,766399,766406,766456,766467,766476,766493,766505-766506,766751,767362,767398,767543,768573,769109,769127,769181,769211,769804,770782,771472,773260,774045,774095,774180-774181
+/couchdb/trunk/etc/default/couchdb:758717,758723,758768,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762019,762153,762574,763816,763818,763833,764257,764835,765419-765420,765479,766347,766353,766358,766373,766390,766392,766399,766406,766456,766467,766476,766493,766505-766506,766751,767362,767398,767543,768573,769109,769127,769181,769211,769804,770782,771472,773260,774045,774095,774180-774181
 /incubator/couchdb/trunk/etc/default/couchdb:642419-694440

svn commit: r774328 - in /couchdb/branches/0.9.x: ./ etc/default/couchdb

2009-05-13 Thread jan

Author: jan
Date: Wed May 13 13:15:58 2009
New Revision: 774328

URL: http://svn.apache.org/viewvc?rev=774328view=rev
Log:
blocked r765819 from trunk

Modified:
couchdb/branches/0.9.x/   (props changed)
couchdb/branches/0.9.x/etc/default/couchdb   (props changed)

Propchange: couchdb/branches/0.9.x/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 13 13:15:58 2009
@@ -1,3 +1,3 @@
 /couchdb/branches/design_resources:751716-751803
 /couchdb/branches/form:729440-730015
-/couchdb/trunk:758717,758723,758768,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762019,762153,762574,763816,763818,763833,764257,764835,765419-765420,765479,766347,766353,766358,766373,766390,766392,766399,766406,766456,766467,766476,766493,766505-766506,766751,767362,767398,767543,768573,769109,769127,769181,769211,769804,770782,771472,773260,774045,774095,774180-774181
+/couchdb/trunk:758717,758723,758768,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762019,762153,762574,763816,763818,763833,764257,764835,765419-765420,765479,765819,766347,766353,766358,766373,766390,766392,766399,766406,766456,766467,766476,766493,766505-766506,766751,767362,767398,767543,768573,769109,769127,769181,769211,769804,770782,771472,773260,774045,774095,774180-774181

Propchange: couchdb/branches/0.9.x/etc/default/couchdb
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 13 13:15:58 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,758723,758768,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762019,762153,762574,763816,763818,763833,764257,764835,765419-765420,765479,766347,766353,766358,766373,766390,766392,766399,766406,766456,766467,766476,766493,766505-766506,766751,767362,767398,767543,768573,769109,769127,769181,769211,769804,770782,771472,773260,774045,774095,774180-774181
+/couchdb/trunk/etc/default/couchdb:758717,758723,758768,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762019,762153,762574,763816,763818,763833,764257,764835,765419-765420,765479,765819,766347,766353,766358,766373,766390,766392,766399,766406,766456,766467,766476,766493,766505-766506,766751,767362,767398,767543,768573,769109,769127,769181,769211,769804,770782,771472,773260,774045,774095,774180-774181
 /incubator/couchdb/trunk/etc/default/couchdb:642419-694440

svn commit: r774329 - in /couchdb/branches/0.9.x: ./ etc/default/couchdb

2009-05-13 Thread jan

Author: jan
Date: Wed May 13 13:16:31 2009
New Revision: 774329

URL: http://svn.apache.org/viewvc?rev=774329view=rev
Log:
blocked r766383 from trunk

Modified:
couchdb/branches/0.9.x/   (props changed)
couchdb/branches/0.9.x/etc/default/couchdb   (props changed)

Propchange: couchdb/branches/0.9.x/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 13 13:16:31 2009
@@ -1,3 +1,3 @@
 /couchdb/branches/design_resources:751716-751803
 /couchdb/branches/form:729440-730015
-/couchdb/trunk:758717,758723,758768,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762019,762153,762574,763816,763818,763833,764257,764835,765419-765420,765479,765819,766347,766353,766358,766373,766390,766392,766399,766406,766456,766467,766476,766493,766505-766506,766751,767362,767398,767543,768573,769109,769127,769181,769211,769804,770782,771472,773260,774045,774095,774180-774181
+/couchdb/trunk:758717,758723,758768,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762019,762153,762574,763816,763818,763833,764257,764835,765419-765420,765479,765819,766347,766353,766358,766373,766383,766390,766392,766399,766406,766456,766467,766476,766493,766505-766506,766751,767362,767398,767543,768573,769109,769127,769181,769211,769804,770782,771472,773260,774045,774095,774180-774181

Propchange: couchdb/branches/0.9.x/etc/default/couchdb
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 13 13:16:31 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,758723,758768,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762019,762153,762574,763816,763818,763833,764257,764835,765419-765420,765479,765819,766347,766353,766358,766373,766390,766392,766399,766406,766456,766467,766476,766493,766505-766506,766751,767362,767398,767543,768573,769109,769127,769181,769211,769804,770782,771472,773260,774045,774095,774180-774181
+/couchdb/trunk/etc/default/couchdb:758717,758723,758768,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762019,762153,762574,763816,763818,763833,764257,764835,765419-765420,765479,765819,766347,766353,766358,766373,766383,766390,766392,766399,766406,766456,766467,766476,766493,766505-766506,766751,767362,767398,767543,768573,769109,769127,769181,769211,769804,770782,771472,773260,774045,774095,774180-774181
 /incubator/couchdb/trunk/etc/default/couchdb:642419-694440

svn commit: r774331 - in /couchdb/branches/0.9.x: ./ etc/default/couchdb

2009-05-13 Thread jan

Author: jan
Date: Wed May 13 13:17:26 2009
New Revision: 774331

URL: http://svn.apache.org/viewvc?rev=774331view=rev
Log:
blocked r767164 from trunk

Modified:
couchdb/branches/0.9.x/   (props changed)
couchdb/branches/0.9.x/etc/default/couchdb   (props changed)

Propchange: couchdb/branches/0.9.x/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 13 13:17:26 2009
@@ -1,3 +1,3 @@
 /couchdb/branches/design_resources:751716-751803
 /couchdb/branches/form:729440-730015
-/couchdb/trunk:758717,758723,758768,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762019,762153,762574,763816,763818,763833,764257,764835,765419-765420,765479,765819,766347,766353,766358,766373,766383,766390,766392,766399,766406-766407,766456,766467,766476,766493,766505-766506,766751,767362,767398,767543,768573,769109,769127,769181,769211,769804,770782,771472,773260,774045,774095,774180-774181
+/couchdb/trunk:758717,758723,758768,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762019,762153,762574,763816,763818,763833,764257,764835,765419-765420,765479,765819,766347,766353,766358,766373,766383,766390,766392,766399,766406-766407,766456,766467,766476,766493,766505-766506,766751,767164,767362,767398,767543,768573,769109,769127,769181,769211,769804,770782,771472,773260,774045,774095,774180-774181

Propchange: couchdb/branches/0.9.x/etc/default/couchdb
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 13 13:17:26 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,758723,758768,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762019,762153,762574,763816,763818,763833,764257,764835,765419-765420,765479,765819,766347,766353,766358,766373,766383,766390,766392,766399,766406-766407,766456,766467,766476,766493,766505-766506,766751,767362,767398,767543,768573,769109,769127,769181,769211,769804,770782,771472,773260,774045,774095,774180-774181
+/couchdb/trunk/etc/default/couchdb:758717,758723,758768,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762019,762153,762574,763816,763818,763833,764257,764835,765419-765420,765479,765819,766347,766353,766358,766373,766383,766390,766392,766399,766406-766407,766456,766467,766476,766493,766505-766506,766751,767164,767362,767398,767543,768573,769109,769127,769181,769211,769804,770782,771472,773260,774045,774095,774180-774181
 /incubator/couchdb/trunk/etc/default/couchdb:642419-694440

svn commit: r774332 - in /couchdb/branches/0.9.x: ./ etc/default/couchdb

2009-05-13 Thread jan

Author: jan
Date: Wed May 13 13:17:47 2009
New Revision: 774332

URL: http://svn.apache.org/viewvc?rev=774332view=rev
Log:
blocked r767175 from trunk

Modified:
couchdb/branches/0.9.x/   (props changed)
couchdb/branches/0.9.x/etc/default/couchdb   (props changed)

Propchange: couchdb/branches/0.9.x/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 13 13:17:47 2009
@@ -1,3 +1,3 @@
 /couchdb/branches/design_resources:751716-751803
 /couchdb/branches/form:729440-730015
-/couchdb/trunk:758717,758723,758768,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762019,762153,762574,763816,763818,763833,764257,764835,765419-765420,765479,765819,766347,766353,766358,766373,766383,766390,766392,766399,766406-766407,766456,766467,766476,766493,766505-766506,766751,767164,767362,767398,767543,768573,769109,769127,769181,769211,769804,770782,771472,773260,774045,774095,774180-774181
+/couchdb/trunk:758717,758723,758768,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762019,762153,762574,763816,763818,763833,764257,764835,765419-765420,765479,765819,766347,766353,766358,766373,766383,766390,766392,766399,766406-766407,766456,766467,766476,766493,766505-766506,766751,767164,767175,767362,767398,767543,768573,769109,769127,769181,769211,769804,770782,771472,773260,774045,774095,774180-774181

Propchange: couchdb/branches/0.9.x/etc/default/couchdb
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 13 13:17:47 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,758723,758768,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762019,762153,762574,763816,763818,763833,764257,764835,765419-765420,765479,765819,766347,766353,766358,766373,766383,766390,766392,766399,766406-766407,766456,766467,766476,766493,766505-766506,766751,767164,767362,767398,767543,768573,769109,769127,769181,769211,769804,770782,771472,773260,774045,774095,774180-774181
+/couchdb/trunk/etc/default/couchdb:758717,758723,758768,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762019,762153,762574,763816,763818,763833,764257,764835,765419-765420,765479,765819,766347,766353,766358,766373,766383,766390,766392,766399,766406-766407,766456,766467,766476,766493,766505-766506,766751,767164,767175,767362,767398,767543,768573,769109,769127,769181,769211,769804,770782,771472,773260,774045,774095,774180-774181
 /incubator/couchdb/trunk/etc/default/couchdb:642419-694440

svn commit: r774333 - in /couchdb/branches/0.9.x: ./ etc/default/couchdb

2009-05-13 Thread jan

Author: jan
Date: Wed May 13 13:18:11 2009
New Revision: 774333

URL: http://svn.apache.org/viewvc?rev=774333view=rev
Log:
blocked r767176 from trunk

Modified:
couchdb/branches/0.9.x/   (props changed)
couchdb/branches/0.9.x/etc/default/couchdb   (props changed)

Propchange: couchdb/branches/0.9.x/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 13 13:18:11 2009
@@ -1,3 +1,3 @@
 /couchdb/branches/design_resources:751716-751803
 /couchdb/branches/form:729440-730015
-/couchdb/trunk:758717,758723,758768,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762019,762153,762574,763816,763818,763833,764257,764835,765419-765420,765479,765819,766347,766353,766358,766373,766383,766390,766392,766399,766406-766407,766456,766467,766476,766493,766505-766506,766751,767164,767175,767362,767398,767543,768573,769109,769127,769181,769211,769804,770782,771472,773260,774045,774095,774180-774181
+/couchdb/trunk:758717,758723,758768,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762019,762153,762574,763816,763818,763833,764257,764835,765419-765420,765479,765819,766347,766353,766358,766373,766383,766390,766392,766399,766406-766407,766456,766467,766476,766493,766505-766506,766751,767164,767175-767176,767362,767398,767543,768573,769109,769127,769181,769211,769804,770782,771472,773260,774045,774095,774180-774181

Propchange: couchdb/branches/0.9.x/etc/default/couchdb
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 13 13:18:11 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,758723,758768,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762019,762153,762574,763816,763818,763833,764257,764835,765419-765420,765479,765819,766347,766353,766358,766373,766383,766390,766392,766399,766406-766407,766456,766467,766476,766493,766505-766506,766751,767164,767175,767362,767398,767543,768573,769109,769127,769181,769211,769804,770782,771472,773260,774045,774095,774180-774181
+/couchdb/trunk/etc/default/couchdb:758717,758723,758768,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762019,762153,762574,763816,763818,763833,764257,764835,765419-765420,765479,765819,766347,766353,766358,766373,766383,766390,766392,766399,766406-766407,766456,766467,766476,766493,766505-766506,766751,767164,767175-767176,767362,767398,767543,768573,769109,769127,769181,769211,769804,770782,771472,773260,774045,774095,774180-774181
 /incubator/couchdb/trunk/etc/default/couchdb:642419-694440

svn commit: r774338 - in /couchdb/branches/0.9.x: ./ etc/default/couchdb

2009-05-13 Thread jan

Author: jan
Date: Wed May 13 13:19:43 2009
New Revision: 774338

URL: http://svn.apache.org/viewvc?rev=774338view=rev
Log:
blocked r767206 from trunk

Modified:
couchdb/branches/0.9.x/   (props changed)
couchdb/branches/0.9.x/etc/default/couchdb   (props changed)

Propchange: couchdb/branches/0.9.x/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 13 13:19:43 2009
@@ -1,3 +1,3 @@
 /couchdb/branches/design_resources:751716-751803
 /couchdb/branches/form:729440-730015
-/couchdb/trunk:758717,758723,758768,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762019,762153,762574,763816,763818,763833,764257,764835,765419-765420,765479,765819,766347,766353,766358,766373,766383,766390,766392,766399,766406-766407,766456,766467,766476,766493,766505-766506,766751,767164,767175-767176,767190,767204,767362,767398,767543,768573,769109,769127,769181,769211,769804,770782,771472,773260,774045,774095,774180-774181
+/couchdb/trunk:758717,758723,758768,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762019,762153,762574,763816,763818,763833,764257,764835,765419-765420,765479,765819,766347,766353,766358,766373,766383,766390,766392,766399,766406-766407,766456,766467,766476,766493,766505-766506,766751,767164,767175-767176,767190,767204,767206,767362,767398,767543,768573,769109,769127,769181,769211,769804,770782,771472,773260,774045,774095,774180-774181

Propchange: couchdb/branches/0.9.x/etc/default/couchdb
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 13 13:19:43 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,758723,758768,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762019,762153,762574,763816,763818,763833,764257,764835,765419-765420,765479,765819,766347,766353,766358,766373,766383,766390,766392,766399,766406-766407,766456,766467,766476,766493,766505-766506,766751,767164,767175-767176,767190,767204,767362,767398,767543,768573,769109,769127,769181,769211,769804,770782,771472,773260,774045,774095,774180-774181
+/couchdb/trunk/etc/default/couchdb:758717,758723,758768,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762019,762153,762574,763816,763818,763833,764257,764835,765419-765420,765479,765819,766347,766353,766358,766373,766383,766390,766392,766399,766406-766407,766456,766467,766476,766493,766505-766506,766751,767164,767175-767176,767190,767204,767206,767362,767398,767543,768573,769109,769127,769181,769211,769804,770782,771472,773260,774045,774095,774180-774181
 /incubator/couchdb/trunk/etc/default/couchdb:642419-694440

svn commit: r774340 - in /couchdb/branches/0.9.x: ./ etc/default/couchdb

2009-05-13 Thread jan

Author: jan
Date: Wed May 13 13:20:27 2009
New Revision: 774340

URL: http://svn.apache.org/viewvc?rev=774340view=rev
Log:
blocked r769792 from trunk

Modified:
couchdb/branches/0.9.x/   (props changed)
couchdb/branches/0.9.x/etc/default/couchdb   (props changed)

Propchange: couchdb/branches/0.9.x/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 13 13:20:27 2009
@@ -1,3 +1,3 @@
 /couchdb/branches/design_resources:751716-751803
 /couchdb/branches/form:729440-730015
-/couchdb/trunk:758717,758723,758768,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762019,762153,762574,763816,763818,763833,764257,764835,765419-765420,765479,765819,766347,766353,766358,766373,766383,766390,766392,766399,766406-766407,766456,766467,766476,766493,766505-766506,766751,767164,767175-767176,767190,767204,767206,767208,767362,767398,767543,768573,769109,769127,769181,769211,769804,770782,771472,773260,774045,774095,774180-774181
+/couchdb/trunk:758717,758723,758768,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762019,762153,762574,763816,763818,763833,764257,764835,765419-765420,765479,765819,766347,766353,766358,766373,766383,766390,766392,766399,766406-766407,766456,766467,766476,766493,766505-766506,766751,767164,767175-767176,767190,767204,767206,767208,767362,767398,767543,768573,769109,769127,769181,769211,769792,769804,770782,771472,773260,774045,774095,774180-774181

Propchange: couchdb/branches/0.9.x/etc/default/couchdb
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 13 13:20:27 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,758723,758768,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762019,762153,762574,763816,763818,763833,764257,764835,765419-765420,765479,765819,766347,766353,766358,766373,766383,766390,766392,766399,766406-766407,766456,766467,766476,766493,766505-766506,766751,767164,767175-767176,767190,767204,767206,767208,767362,767398,767543,768573,769109,769127,769181,769211,769804,770782,771472,773260,774045,774095,774180-774181
+/couchdb/trunk/etc/default/couchdb:758717,758723,758768,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762019,762153,762574,763816,763818,763833,764257,764835,765419-765420,765479,765819,766347,766353,766358,766373,766383,766390,766392,766399,766406-766407,766456,766467,766476,766493,766505-766506,766751,767164,767175-767176,767190,767204,767206,767208,767362,767398,767543,768573,769109,769127,769181,769211,769792,769804,770782,771472,773260,774045,774095,774180-774181
 /incubator/couchdb/trunk/etc/default/couchdb:642419-694440

svn commit: r774342 - in /couchdb/branches/0.9.x: ./ etc/default/couchdb

2009-05-13 Thread jan

Author: jan
Date: Wed May 13 13:20:45 2009
New Revision: 774342

URL: http://svn.apache.org/viewvc?rev=774342view=rev
Log:
blocked r771418 from trunk

Modified:
couchdb/branches/0.9.x/   (props changed)
couchdb/branches/0.9.x/etc/default/couchdb   (props changed)

Propchange: couchdb/branches/0.9.x/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 13 13:20:45 2009
@@ -1,3 +1,3 @@
 /couchdb/branches/design_resources:751716-751803
 /couchdb/branches/form:729440-730015
-/couchdb/trunk:758717,758723,758768,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762019,762153,762574,763816,763818,763833,764257,764835,765419-765420,765479,765819,766347,766353,766358,766373,766383,766390,766392,766399,766406-766407,766456,766467,766476,766493,766505-766506,766751,767164,767175-767176,767190,767204,767206,767208,767362,767398,767543,768573,769109,769127,769181,769211,769792,769804,770782,771472,773260,774045,774095,774180-774181
+/couchdb/trunk:758717,758723,758768,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762019,762153,762574,763816,763818,763833,764257,764835,765419-765420,765479,765819,766347,766353,766358,766373,766383,766390,766392,766399,766406-766407,766456,766467,766476,766493,766505-766506,766751,767164,767175-767176,767190,767204,767206,767208,767362,767398,767543,768573,769109,769127,769181,769211,769792,769804,770782,771418,771472,773260,774045,774095,774180-774181

Propchange: couchdb/branches/0.9.x/etc/default/couchdb
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 13 13:20:45 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,758723,758768,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762019,762153,762574,763816,763818,763833,764257,764835,765419-765420,765479,765819,766347,766353,766358,766373,766383,766390,766392,766399,766406-766407,766456,766467,766476,766493,766505-766506,766751,767164,767175-767176,767190,767204,767206,767208,767362,767398,767543,768573,769109,769127,769181,769211,769792,769804,770782,771472,773260,774045,774095,774180-774181
+/couchdb/trunk/etc/default/couchdb:758717,758723,758768,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762019,762153,762574,763816,763818,763833,764257,764835,765419-765420,765479,765819,766347,766353,766358,766373,766383,766390,766392,766399,766406-766407,766456,766467,766476,766493,766505-766506,766751,767164,767175-767176,767190,767204,767206,767208,767362,767398,767543,768573,769109,769127,769181,769211,769792,769804,770782,771418,771472,773260,774045,774095,774180-774181
 /incubator/couchdb/trunk/etc/default/couchdb:642419-694440

svn commit: r774343 - in /couchdb/branches/0.9.x: ./ etc/default/couchdb

2009-05-13 Thread jan

Author: jan
Date: Wed May 13 13:21:05 2009
New Revision: 774343

URL: http://svn.apache.org/viewvc?rev=774343view=rev
Log:
blocked r771466 from trunk

Modified:
couchdb/branches/0.9.x/   (props changed)
couchdb/branches/0.9.x/etc/default/couchdb   (props changed)

Propchange: couchdb/branches/0.9.x/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 13 13:21:05 2009
@@ -1,3 +1,3 @@
 /couchdb/branches/design_resources:751716-751803
 /couchdb/branches/form:729440-730015
-/couchdb/trunk:758717,758723,758768,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762019,762153,762574,763816,763818,763833,764257,764835,765419-765420,765479,765819,766347,766353,766358,766373,766383,766390,766392,766399,766406-766407,766456,766467,766476,766493,766505-766506,766751,767164,767175-767176,767190,767204,767206,767208,767362,767398,767543,768573,769109,769127,769181,769211,769792,769804,770782,771418,771472,773260,774045,774095,774180-774181
+/couchdb/trunk:758717,758723,758768,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762019,762153,762574,763816,763818,763833,764257,764835,765419-765420,765479,765819,766347,766353,766358,766373,766383,766390,766392,766399,766406-766407,766456,766467,766476,766493,766505-766506,766751,767164,767175-767176,767190,767204,767206,767208,767362,767398,767543,768573,769109,769127,769181,769211,769792,769804,770782,771418,771466,771472,773260,774045,774095,774180-774181

Propchange: couchdb/branches/0.9.x/etc/default/couchdb
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 13 13:21:05 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,758723,758768,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762019,762153,762574,763816,763818,763833,764257,764835,765419-765420,765479,765819,766347,766353,766358,766373,766383,766390,766392,766399,766406-766407,766456,766467,766476,766493,766505-766506,766751,767164,767175-767176,767190,767204,767206,767208,767362,767398,767543,768573,769109,769127,769181,769211,769792,769804,770782,771418,771472,773260,774045,774095,774180-774181
+/couchdb/trunk/etc/default/couchdb:758717,758723,758768,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762019,762153,762574,763816,763818,763833,764257,764835,765419-765420,765479,765819,766347,766353,766358,766373,766383,766390,766392,766399,766406-766407,766456,766467,766476,766493,766505-766506,766751,767164,767175-767176,767190,767204,767206,767208,767362,767398,767543,768573,769109,769127,769181,769211,769792,769804,770782,771418,771466,771472,773260,774045,774095,774180-774181
 /incubator/couchdb/trunk/etc/default/couchdb:642419-694440

svn commit: r774345 - in /couchdb/branches/0.9.x: ./ etc/default/couchdb

2009-05-13 Thread jan

Author: jan
Date: Wed May 13 13:21:50 2009
New Revision: 774345

URL: http://svn.apache.org/viewvc?rev=774345view=rev
Log:
blocked r772406 from trunk

Modified:
couchdb/branches/0.9.x/   (props changed)
couchdb/branches/0.9.x/etc/default/couchdb   (props changed)

Propchange: couchdb/branches/0.9.x/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 13 13:21:50 2009
@@ -1,3 +1,3 @@
 /couchdb/branches/design_resources:751716-751803
 /couchdb/branches/form:729440-730015
-/couchdb/trunk:758717,758723,758768,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762019,762153,762574,763816,763818,763833,764257,764835,765419-765420,765479,765819,766347,766353,766358,766373,766383,766390,766392,766399,766406-766407,766456,766467,766476,766493,766505-766506,766751,767164,767175-767176,767190,767204,767206,767208,767362,767398,767543,768573,769109,769127,769181,769211,769792,769804,770782,771418,771466,771472,773260,774045,774095,774180-774181
+/couchdb/trunk:758717,758723,758768,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762019,762153,762574,763816,763818,763833,764257,764835,765419-765420,765479,765819,766347,766353,766358,766373,766383,766390,766392,766399,766406-766407,766456,766467,766476,766493,766505-766506,766751,767164,767175-767176,767190,767204,767206,767208,767362,767398,767543,768573,769109,769127,769181,769211,769792,769804,770782,771418,771466,771472,772406,773260,774045,774095,774180-774181

Propchange: couchdb/branches/0.9.x/etc/default/couchdb
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 13 13:21:50 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,758723,758768,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762019,762153,762574,763816,763818,763833,764257,764835,765419-765420,765479,765819,766347,766353,766358,766373,766383,766390,766392,766399,766406-766407,766456,766467,766476,766493,766505-766506,766751,767164,767175-767176,767190,767204,767206,767208,767362,767398,767543,768573,769109,769127,769181,769211,769792,769804,770782,771418,771466,771472,773260,774045,774095,774180-774181
+/couchdb/trunk/etc/default/couchdb:758717,758723,758768,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762019,762153,762574,763816,763818,763833,764257,764835,765419-765420,765479,765819,766347,766353,766358,766373,766383,766390,766392,766399,766406-766407,766456,766467,766476,766493,766505-766506,766751,767164,767175-767176,767190,767204,767206,767208,767362,767398,767543,768573,769109,769127,769181,769211,769792,769804,770782,771418,771466,771472,772406,773260,774045,774095,774180-774181
 /incubator/couchdb/trunk/etc/default/couchdb:642419-694440

svn commit: r774346 - in /couchdb/branches/0.9.x: ./ etc/default/couchdb

2009-05-13 Thread jan

Author: jan
Date: Wed May 13 13:22:10 2009
New Revision: 774346

URL: http://svn.apache.org/viewvc?rev=774346view=rev
Log:
blocked r772415 from trunk

Modified:
couchdb/branches/0.9.x/   (props changed)
couchdb/branches/0.9.x/etc/default/couchdb   (props changed)

Propchange: couchdb/branches/0.9.x/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 13 13:22:10 2009
@@ -1,3 +1,3 @@
 /couchdb/branches/design_resources:751716-751803
 /couchdb/branches/form:729440-730015
-/couchdb/trunk:758717,758723,758768,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762019,762153,762574,763816,763818,763833,764257,764835,765419-765420,765479,765819,766347,766353,766358,766373,766383,766390,766392,766399,766406-766407,766456,766467,766476,766493,766505-766506,766751,767164,767175-767176,767190,767204,767206,767208,767362,767398,767543,768573,769109,769127,769181,769211,769792,769804,770782,771418,771466,771472,772406,773260,774045,774095,774180-774181
+/couchdb/trunk:758717,758723,758768,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762019,762153,762574,763816,763818,763833,764257,764835,765419-765420,765479,765819,766347,766353,766358,766373,766383,766390,766392,766399,766406-766407,766456,766467,766476,766493,766505-766506,766751,767164,767175-767176,767190,767204,767206,767208,767362,767398,767543,768573,769109,769127,769181,769211,769792,769804,770782,771418,771466,771472,772406,772415,773260,774045,774095,774180-774181

Propchange: couchdb/branches/0.9.x/etc/default/couchdb
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 13 13:22:10 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,758723,758768,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762019,762153,762574,763816,763818,763833,764257,764835,765419-765420,765479,765819,766347,766353,766358,766373,766383,766390,766392,766399,766406-766407,766456,766467,766476,766493,766505-766506,766751,767164,767175-767176,767190,767204,767206,767208,767362,767398,767543,768573,769109,769127,769181,769211,769792,769804,770782,771418,771466,771472,772406,773260,774045,774095,774180-774181
+/couchdb/trunk/etc/default/couchdb:758717,758723,758768,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762019,762153,762574,763816,763818,763833,764257,764835,765419-765420,765479,765819,766347,766353,766358,766373,766383,766390,766392,766399,766406-766407,766456,766467,766476,766493,766505-766506,766751,767164,767175-767176,767190,767204,767206,767208,767362,767398,767543,768573,769109,769127,769181,769211,769792,769804,770782,771418,771466,771472,772406,772415,773260,774045,774095,774180-774181
 /incubator/couchdb/trunk/etc/default/couchdb:642419-694440

svn commit: r774347 - in /couchdb/branches/0.9.x: ./ etc/default/couchdb

2009-05-13 Thread jan

Author: jan
Date: Wed May 13 13:22:28 2009
New Revision: 774347

URL: http://svn.apache.org/viewvc?rev=774347view=rev
Log:
blocked r772978 from trunk

Modified:
couchdb/branches/0.9.x/   (props changed)
couchdb/branches/0.9.x/etc/default/couchdb   (props changed)

Propchange: couchdb/branches/0.9.x/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 13 13:22:28 2009
@@ -1,3 +1,3 @@
 /couchdb/branches/design_resources:751716-751803
 /couchdb/branches/form:729440-730015
-/couchdb/trunk:758717,758723,758768,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762019,762153,762574,763816,763818,763833,764257,764835,765419-765420,765479,765819,766347,766353,766358,766373,766383,766390,766392,766399,766406-766407,766456,766467,766476,766493,766505-766506,766751,767164,767175-767176,767190,767204,767206,767208,767362,767398,767543,768573,769109,769127,769181,769211,769792,769804,770782,771418,771466,771472,772406,772415,773260,774045,774095,774180-774181
+/couchdb/trunk:758717,758723,758768,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762019,762153,762574,763816,763818,763833,764257,764835,765419-765420,765479,765819,766347,766353,766358,766373,766383,766390,766392,766399,766406-766407,766456,766467,766476,766493,766505-766506,766751,767164,767175-767176,767190,767204,767206,767208,767362,767398,767543,768573,769109,769127,769181,769211,769792,769804,770782,771418,771466,771472,772406,772415,772978,773260,774045,774095,774180-774181

Propchange: couchdb/branches/0.9.x/etc/default/couchdb
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 13 13:22:28 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,758723,758768,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762019,762153,762574,763816,763818,763833,764257,764835,765419-765420,765479,765819,766347,766353,766358,766373,766383,766390,766392,766399,766406-766407,766456,766467,766476,766493,766505-766506,766751,767164,767175-767176,767190,767204,767206,767208,767362,767398,767543,768573,769109,769127,769181,769211,769792,769804,770782,771418,771466,771472,772406,772415,773260,774045,774095,774180-774181
+/couchdb/trunk/etc/default/couchdb:758717,758723,758768,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762019,762153,762574,763816,763818,763833,764257,764835,765419-765420,765479,765819,766347,766353,766358,766373,766383,766390,766392,766399,766406-766407,766456,766467,766476,766493,766505-766506,766751,767164,767175-767176,767190,767204,767206,767208,767362,767398,767543,768573,769109,769127,769181,769211,769792,769804,770782,771418,771466,771472,772406,772415,772978,773260,774045,774095,774180-774181
 /incubator/couchdb/trunk/etc/default/couchdb:642419-694440

svn commit: r774349 - in /couchdb/branches/0.9.x: ./ etc/default/couchdb

2009-05-13 Thread jan

Author: jan
Date: Wed May 13 13:23:04 2009
New Revision: 774349

URL: http://svn.apache.org/viewvc?rev=774349view=rev
Log:
blocked r773319 from trunk

Modified:
couchdb/branches/0.9.x/   (props changed)
couchdb/branches/0.9.x/etc/default/couchdb   (props changed)

Propchange: couchdb/branches/0.9.x/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 13 13:23:04 2009
@@ -1,3 +1,3 @@
 /couchdb/branches/design_resources:751716-751803
 /couchdb/branches/form:729440-730015
-/couchdb/trunk:758717,758723,758768,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762019,762153,762574,763816,763818,763833,764257,764835,765419-765420,765479,765819,766347,766353,766358,766373,766383,766390,766392,766399,766406-766407,766456,766467,766476,766493,766505-766506,766751,767164,767175-767176,767190,767204,767206,767208,767362,767398,767543,768573,769109,769127,769181,769211,769792,769804,770782,771418,771466,771472,772406,772415,772978,773260,774045,774095,774180-774181
+/couchdb/trunk:758717,758723,758768,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762019,762153,762574,763816,763818,763833,764257,764835,765419-765420,765479,765819,766347,766353,766358,766373,766383,766390,766392,766399,766406-766407,766456,766467,766476,766493,766505-766506,766751,767164,767175-767176,767190,767204,767206,767208,767362,767398,767543,768573,769109,769127,769181,769211,769792,769804,770782,771418,771466,771472,772406,772415,772978,773260,773319,774045,774095,774180-774181

Propchange: couchdb/branches/0.9.x/etc/default/couchdb
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 13 13:23:04 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,758723,758768,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762019,762153,762574,763816,763818,763833,764257,764835,765419-765420,765479,765819,766347,766353,766358,766373,766383,766390,766392,766399,766406-766407,766456,766467,766476,766493,766505-766506,766751,767164,767175-767176,767190,767204,767206,767208,767362,767398,767543,768573,769109,769127,769181,769211,769792,769804,770782,771418,771466,771472,772406,772415,772978,773260,774045,774095,774180-774181
+/couchdb/trunk/etc/default/couchdb:758717,758723,758768,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762019,762153,762574,763816,763818,763833,764257,764835,765419-765420,765479,765819,766347,766353,766358,766373,766383,766390,766392,766399,766406-766407,766456,766467,766476,766493,766505-766506,766751,767164,767175-767176,767190,767204,767206,767208,767362,767398,767543,768573,769109,769127,769181,769211,769792,769804,770782,771418,771466,771472,772406,772415,772978,773260,773319,774045,774095,774180-774181
 /incubator/couchdb/trunk/etc/default/couchdb:642419-694440

svn commit: r774350 - in /couchdb/branches/0.9.x: ./ etc/default/couchdb

2009-05-13 Thread jan

Author: jan
Date: Wed May 13 13:23:23 2009
New Revision: 774350

URL: http://svn.apache.org/viewvc?rev=774350view=rev
Log:
blocked r773387 from trunk

Modified:
couchdb/branches/0.9.x/   (props changed)
couchdb/branches/0.9.x/etc/default/couchdb   (props changed)

Propchange: couchdb/branches/0.9.x/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 13 13:23:23 2009
@@ -1,3 +1,3 @@
 /couchdb/branches/design_resources:751716-751803
 /couchdb/branches/form:729440-730015
-/couchdb/trunk:758717,758723,758768,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762019,762153,762574,763816,763818,763833,764257,764835,765419-765420,765479,765819,766347,766353,766358,766373,766383,766390,766392,766399,766406-766407,766456,766467,766476,766493,766505-766506,766751,767164,767175-767176,767190,767204,767206,767208,767362,767398,767543,768573,769109,769127,769181,769211,769792,769804,770782,771418,771466,771472,772406,772415,772978,773260,773319,774045,774095,774180-774181
+/couchdb/trunk:758717,758723,758768,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762019,762153,762574,763816,763818,763833,764257,764835,765419-765420,765479,765819,766347,766353,766358,766373,766383,766390,766392,766399,766406-766407,766456,766467,766476,766493,766505-766506,766751,767164,767175-767176,767190,767204,767206,767208,767362,767398,767543,768573,769109,769127,769181,769211,769792,769804,770782,771418,771466,771472,772406,772415,772978,773260,773319,773387,774045,774095,774180-774181

Propchange: couchdb/branches/0.9.x/etc/default/couchdb
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 13 13:23:23 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,758723,758768,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762019,762153,762574,763816,763818,763833,764257,764835,765419-765420,765479,765819,766347,766353,766358,766373,766383,766390,766392,766399,766406-766407,766456,766467,766476,766493,766505-766506,766751,767164,767175-767176,767190,767204,767206,767208,767362,767398,767543,768573,769109,769127,769181,769211,769792,769804,770782,771418,771466,771472,772406,772415,772978,773260,773319,774045,774095,774180-774181
+/couchdb/trunk/etc/default/couchdb:758717,758723,758768,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762019,762153,762574,763816,763818,763833,764257,764835,765419-765420,765479,765819,766347,766353,766358,766373,766383,766390,766392,766399,766406-766407,766456,766467,766476,766493,766505-766506,766751,767164,767175-767176,767190,767204,767206,767208,767362,767398,767543,768573,769109,769127,769181,769211,769792,769804,770782,771418,771466,771472,772406,772415,772978,773260,773319,773387,774045,774095,774180-774181
 /incubator/couchdb/trunk/etc/default/couchdb:642419-694440

svn commit: r774351 - in /couchdb/branches/0.9.x: ./ etc/default/couchdb

2009-05-13 Thread jan

Author: jan
Date: Wed May 13 13:23:50 2009
New Revision: 774351

URL: http://svn.apache.org/viewvc?rev=774351view=rev
Log:
blocked r774101 from trunk

Modified:
couchdb/branches/0.9.x/   (props changed)
couchdb/branches/0.9.x/etc/default/couchdb   (props changed)

Propchange: couchdb/branches/0.9.x/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 13 13:23:50 2009
@@ -1,3 +1,3 @@
 /couchdb/branches/design_resources:751716-751803
 /couchdb/branches/form:729440-730015
-/couchdb/trunk:758717,758723,758768,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762019,762153,762574,763816,763818,763833,764257,764835,765419-765420,765479,765819,766347,766353,766358,766373,766383,766390,766392,766399,766406-766407,766456,766467,766476,766493,766505-766506,766751,767164,767175-767176,767190,767204,767206,767208,767362,767398,767543,768573,769109,769127,769181,769211,769792,769804,770782,771418,771466,771472,772406,772415,772978,773260,773319,773387,774045,774095,774180-774181
+/couchdb/trunk:758717,758723,758768,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762019,762153,762574,763816,763818,763833,764257,764835,765419-765420,765479,765819,766347,766353,766358,766373,766383,766390,766392,766399,766406-766407,766456,766467,766476,766493,766505-766506,766751,767164,767175-767176,767190,767204,767206,767208,767362,767398,767543,768573,769109,769127,769181,769211,769792,769804,770782,771418,771466,771472,772406,772415,772978,773260,773319,773387,774045,774095,774101,774180-774181

Propchange: couchdb/branches/0.9.x/etc/default/couchdb
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 13 13:23:50 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,758723,758768,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762019,762153,762574,763816,763818,763833,764257,764835,765419-765420,765479,765819,766347,766353,766358,766373,766383,766390,766392,766399,766406-766407,766456,766467,766476,766493,766505-766506,766751,767164,767175-767176,767190,767204,767206,767208,767362,767398,767543,768573,769109,769127,769181,769211,769792,769804,770782,771418,771466,771472,772406,772415,772978,773260,773319,773387,774045,774095,774180-774181
+/couchdb/trunk/etc/default/couchdb:758717,758723,758768,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762019,762153,762574,763816,763818,763833,764257,764835,765419-765420,765479,765819,766347,766353,766358,766373,766383,766390,766392,766399,766406-766407,766456,766467,766476,766493,766505-766506,766751,767164,767175-767176,767190,767204,767206,767208,767362,767398,767543,768573,769109,769127,769181,769211,769792,769804,770782,771418,771466,771472,772406,772415,772978,773260,773319,773387,774045,774095,774101,774180-774181
 /incubator/couchdb/trunk/etc/default/couchdb:642419-694440

svn commit: r774352 - in /couchdb/branches/0.9.x: ./ etc/default/couchdb

2009-05-13 Thread jan

Author: jan
Date: Wed May 13 13:25:14 2009
New Revision: 774352

URL: http://svn.apache.org/viewvc?rev=774352view=rev
Log:
blocked r773401 from trunk

Modified:
couchdb/branches/0.9.x/   (props changed)
couchdb/branches/0.9.x/etc/default/couchdb   (props changed)

Propchange: couchdb/branches/0.9.x/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 13 13:25:14 2009
@@ -1,3 +1,3 @@
 /couchdb/branches/design_resources:751716-751803
 /couchdb/branches/form:729440-730015
-/couchdb/trunk:758717,758723,758768,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762019,762153,762574,763816,763818,763833,764257,764835,765419-765420,765479,765819,766347,766353,766358,766373,766383,766390,766392,766399,766406-766407,766456,766467,766476,766493,766505-766506,766751,767164,767175-767176,767190,767204,767206,767208,767362,767398,767543,768573,769109,769127,769181,769211,769792,769804,770782,771418,771466,771472,772406,772415,772978,773260,773319,773387,774045,774095,774101,774180-774181
+/couchdb/trunk:758717,758723,758768,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762019,762153,762574,763816,763818,763833,764257,764835,765419-765420,765479,765819,766347,766353,766358,766373,766383,766390,766392,766399,766406-766407,766456,766467,766476,766493,766505-766506,766751,767164,767175-767176,767190,767204,767206,767208,767362,767398,767543,768573,769109,769127,769181,769211,769792,769804,770782,771418,771466,771472,772406,772415,772978,773260,773319,773387,773401,774045,774095,774101,774180-774181

Propchange: couchdb/branches/0.9.x/etc/default/couchdb
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 13 13:25:14 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,758723,758768,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762019,762153,762574,763816,763818,763833,764257,764835,765419-765420,765479,765819,766347,766353,766358,766373,766383,766390,766392,766399,766406-766407,766456,766467,766476,766493,766505-766506,766751,767164,767175-767176,767190,767204,767206,767208,767362,767398,767543,768573,769109,769127,769181,769211,769792,769804,770782,771418,771466,771472,772406,772415,772978,773260,773319,773387,774045,774095,774101,774180-774181
+/couchdb/trunk/etc/default/couchdb:758717,758723,758768,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762019,762153,762574,763816,763818,763833,764257,764835,765419-765420,765479,765819,766347,766353,766358,766373,766383,766390,766392,766399,766406-766407,766456,766467,766476,766493,766505-766506,766751,767164,767175-767176,767190,767204,767206,767208,767362,767398,767543,768573,769109,769127,769181,769211,769792,769804,770782,771418,771466,771472,772406,772415,772978,773260,773319,773387,773401,774045,774095,774101,774180-774181
 /incubator/couchdb/trunk/etc/default/couchdb:642419-694440

svn commit: r774355 - in /couchdb/branches/0.9.x: ./ etc/default/couchdb

2009-05-13 Thread jan

Author: jan
Date: Wed May 13 13:30:15 2009
New Revision: 774355

URL: http://svn.apache.org/viewvc?rev=774355view=rev
Log:
blocked r767506 from trunk

Modified:
couchdb/branches/0.9.x/   (props changed)
couchdb/branches/0.9.x/etc/default/couchdb   (props changed)

Propchange: couchdb/branches/0.9.x/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 13 13:30:15 2009
@@ -1,3 +1,3 @@
 /couchdb/branches/design_resources:751716-751803
 /couchdb/branches/form:729440-730015
-/couchdb/trunk:758717,758723,758768,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762019,762153,762574,763816,763818,763833,764257,764835,765419-765420,765479,765819,766347,766353,766358,766373,766383,766390,766392,766399,766406-766407,766456,766467,766476,766493,766505-766506,766751,767164,767175-767176,767190,767204,767206,767208,767362,767398,767543,768573,769109,769127,769181,769211,769792,769804,770782,771418,771466,771472,772406,772415,772978,773225,773260,773319,773387,773401,774045,774095,774101,774180-774181
+/couchdb/trunk:758717,758723,758768,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762019,762153,762574,763816,763818,763833,764257,764835,765419-765420,765479,765819,766347,766353,766358,766373,766383,766390,766392,766399,766406-766407,766456,766467,766476,766493,766505-766506,766751,767164,767175-767176,767190,767204,767206,767208,767362,767398,767506,767543,768573,769109,769127,769181,769211,769792,769804,770782,771418,771466,771472,772406,772415,772978,773225,773260,773319,773387,773401,774045,774095,774101,774180-774181

Propchange: couchdb/branches/0.9.x/etc/default/couchdb
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 13 13:30:15 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,758723,758768,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762019,762153,762574,763816,763818,763833,764257,764835,765419-765420,765479,765819,766347,766353,766358,766373,766383,766390,766392,766399,766406-766407,766456,766467,766476,766493,766505-766506,766751,767164,767175-767176,767190,767204,767206,767208,767362,767398,767543,768573,769109,769127,769181,769211,769792,769804,770782,771418,771466,771472,772406,772415,772978,773225,773260,773319,773387,773401,774045,774095,774101,774180-774181
+/couchdb/trunk/etc/default/couchdb:758717,758723,758768,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762019,762153,762574,763816,763818,763833,764257,764835,765419-765420,765479,765819,766347,766353,766358,766373,766383,766390,766392,766399,766406-766407,766456,766467,766476,766493,766505-766506,766751,767164,767175-767176,767190,767204,767206,767208,767362,767398,767506,767543,768573,769109,769127,769181,769211,769792,769804,770782,771418,771466,771472,772406,772415,772978,773225,773260,773319,773387,773401,774045,774095,774101,774180-774181
 /incubator/couchdb/trunk/etc/default/couchdb:642419-694440

svn commit: r774357 - in /couchdb/branches/0.9.x: ./ etc/default/couchdb

2009-05-13 Thread jan

Author: jan
Date: Wed May 13 13:32:30 2009
New Revision: 774357

URL: http://svn.apache.org/viewvc?rev=774357view=rev
Log:
blocked r766767 from trunk

Modified:
couchdb/branches/0.9.x/   (props changed)
couchdb/branches/0.9.x/etc/default/couchdb   (props changed)

Propchange: couchdb/branches/0.9.x/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 13 13:32:30 2009
@@ -1,3 +1,3 @@
 /couchdb/branches/design_resources:751716-751803
 /couchdb/branches/form:729440-730015
-/couchdb/trunk:758717,758723,758768,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762019,762153,762574,763816,763818,763833,764257,764835,765419-765420,765479,765819,766347,766353,766358,766373,766383,766390,766392,766399,766406-766407,766456,766467,766476,766493,766505-766506,766751,767164,767175-767176,767190,767204,767206,767208,767362,767398,767506,767543,768573,769109,769127,769181,769211,769792,769804,770782,771418,771466-771467,771472,772406,772415,772978,773225,773260,773319,773387,773401,774045,774095,774101,774180-774181
+/couchdb/trunk:758717,758723,758768,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762019,762153,762574,763816,763818,763833,764257,764835,765419-765420,765479,765819,766347,766353,766358,766373,766383,766390,766392,766399,766406-766407,766456,766467,766476,766493,766505-766506,766751,766767,767164,767175-767176,767190,767204,767206,767208,767362,767398,767506,767543,768573,769109,769127,769181,769211,769792,769804,770782,771418,771466-771467,771472,772406,772415,772978,773225,773260,773319,773387,773401,774045,774095,774101,774180-774181

Propchange: couchdb/branches/0.9.x/etc/default/couchdb
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 13 13:32:30 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,758723,758768,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762019,762153,762574,763816,763818,763833,764257,764835,765419-765420,765479,765819,766347,766353,766358,766373,766383,766390,766392,766399,766406-766407,766456,766467,766476,766493,766505-766506,766751,767164,767175-767176,767190,767204,767206,767208,767362,767398,767506,767543,768573,769109,769127,769181,769211,769792,769804,770782,771418,771466-771467,771472,772406,772415,772978,773225,773260,773319,773387,773401,774045,774095,774101,774180-774181
+/couchdb/trunk/etc/default/couchdb:758717,758723,758768,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762019,762153,762574,763816,763818,763833,764257,764835,765419-765420,765479,765819,766347,766353,766358,766373,766383,766390,766392,766399,766406-766407,766456,766467,766476,766493,766505-766506,766751,766767,767164,767175-767176,767190,767204,767206,767208,767362,767398,767506,767543,768573,769109,769127,769181,769211,769792,769804,770782,771418,771466-771467,771472,772406,772415,772978,773225,773260,773319,773387,773401,774045,774095,774101,774180-774181
 /incubator/couchdb/trunk/etc/default/couchdb:642419-694440

svn commit: r774358 - in /couchdb/branches/0.9.x: ./ etc/default/couchdb

2009-05-13 Thread jan

Author: jan
Date: Wed May 13 13:33:32 2009
New Revision: 774358

URL: http://svn.apache.org/viewvc?rev=774358view=rev
Log:
blocked r766340 from trunk

Modified:
couchdb/branches/0.9.x/   (props changed)
couchdb/branches/0.9.x/etc/default/couchdb   (props changed)

Propchange: couchdb/branches/0.9.x/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 13 13:33:32 2009
@@ -1,3 +1,3 @@
 /couchdb/branches/design_resources:751716-751803
 /couchdb/branches/form:729440-730015
-/couchdb/trunk:758717,758723,758768,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762019,762153,762574,763816,763818,763833,764257,764835,765419-765420,765479,765819,766347,766353,766358,766373,766383,766390,766392,766399,766406-766407,766456,766467,766476,766493,766505-766506,766751,766767,767164,767175-767176,767190,767204,767206,767208,767362,767398,767506,767543,768573,769109,769127,769181,769211,769792,769804,770782,771418,771466-771467,771472,772406,772415,772978,773225,773260,773319,773387,773401,774045,774095,774101,774180-774181
+/couchdb/trunk:758717,758723,758768,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762019,762153,762574,763816,763818,763833,764257,764835,765419-765420,765479,765819,766340,766347,766353,766358,766373,766383,766390,766392,766399,766406-766407,766456,766467,766476,766493,766505-766506,766751,766767,767164,767175-767176,767190,767204,767206,767208,767362,767398,767506,767543,768573,769109,769127,769181,769211,769792,769804,770782,771418,771466-771467,771472,772406,772415,772978,773225,773260,773319,773387,773401,774045,774095,774101,774180-774181

Propchange: couchdb/branches/0.9.x/etc/default/couchdb
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 13 13:33:32 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,758723,758768,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762019,762153,762574,763816,763818,763833,764257,764835,765419-765420,765479,765819,766347,766353,766358,766373,766383,766390,766392,766399,766406-766407,766456,766467,766476,766493,766505-766506,766751,766767,767164,767175-767176,767190,767204,767206,767208,767362,767398,767506,767543,768573,769109,769127,769181,769211,769792,769804,770782,771418,771466-771467,771472,772406,772415,772978,773225,773260,773319,773387,773401,774045,774095,774101,774180-774181
+/couchdb/trunk/etc/default/couchdb:758717,758723,758768,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762019,762153,762574,763816,763818,763833,764257,764835,765419-765420,765479,765819,766340,766347,766353,766358,766373,766383,766390,766392,766399,766406-766407,766456,766467,766476,766493,766505-766506,766751,766767,767164,767175-767176,767190,767204,767206,767208,767362,767398,767506,767543,768573,769109,769127,769181,769211,769792,769804,770782,771418,771466-771467,771472,772406,772415,772978,773225,773260,773319,773387,773401,774045,774095,774101,774180-774181
 /incubator/couchdb/trunk/etc/default/couchdb:642419-694440

svn commit: r774382 - in /couchdb/branches/0.9.x: share/www/script/test/attachments.js src/couchdb/couch_httpd_db.erl

2009-05-13 Thread kocolosk

Author: kocolosk
Date: Wed May 13 14:29:27 2009
New Revision: 774382

URL: http://svn.apache.org/viewvc?rev=774382view=rev
Log:
merged r771474 from trunk

Modified:
couchdb/branches/0.9.x/share/www/script/test/attachments.js
couchdb/branches/0.9.x/src/couchdb/couch_httpd_db.erl

Modified: couchdb/branches/0.9.x/share/www/script/test/attachments.js
URL: 
http://svn.apache.org/viewvc/couchdb/branches/0.9.x/share/www/script/test/attachments.js?rev=774382r1=774381r2=774382view=diff
==
--- couchdb/branches/0.9.x/share/www/script/test/attachments.js (original)
+++ couchdb/branches/0.9.x/share/www/script/test/attachments.js Wed May 13 
14:29:27 2009
@@ -117,9 +117,15 @@
   var xhr = CouchDB.request(DELETE, 
/test_suite_db/bin_doc3/attachment.txt?rev= + rev);
   T(xhr.status == 200);
   
-  var xhr = CouchDB.request(GET, 
/test_suite_db/bin_doc3/attachment.txt?rev= + rev);
+  var xhr = CouchDB.request(GET, /test_suite_db/bin_doc3/attachment.txt);
   T(xhr.status == 404);
 
+  // deleted attachment is still accessible with revision
+  var xhr = CouchDB.request(GET, 
/test_suite_db/bin_doc3/attachment.txt?rev= + rev);
+  T(xhr.status == 200);
+  T(xhr.responseText == bin_data);
+  T(xhr.getResponseHeader(Content-Type) == text/plain;charset=utf-8);
+
   // empty attachments
   var xhr = CouchDB.request(PUT, /test_suite_db/bin_doc4/attachment.txt, {
 headers:{Content-Type:text/plain;charset=utf-8},

Modified: couchdb/branches/0.9.x/src/couchdb/couch_httpd_db.erl
URL: 
http://svn.apache.org/viewvc/couchdb/branches/0.9.x/src/couchdb/couch_httpd_db.erl?rev=774382r1=774381r2=774382view=diff
==
--- couchdb/branches/0.9.x/src/couchdb/couch_httpd_db.erl (original)
+++ couchdb/branches/0.9.x/src/couchdb/couch_httpd_db.erl Wed May 13 14:29:27 
2009
@@ -583,33 +583,36 @@
 
 db_attachment_req(#httpd{method='GET'}=Req, Db, DocId, FileNameParts) -
 FileName = list_to_binary(mochiweb_util:join(lists:map(fun 
binary_to_list/1, FileNameParts),/)),
-case couch_db:open_doc(Db, DocId, []) of
-{ok, #doc{attachments=Attachments}=Doc} -
-case proplists:get_value(FileName, Attachments) of
-undefined -
-throw({not_found, Document is missing attachment});
-{Type, Bin} -
-{ok, Resp} = start_chunked_response(Req, 200, [
-{ETag, couch_httpd:doc_etag(Doc)},
-{Cache-Control, must-revalidate},
-{Content-Type, binary_to_list(Type)}%,
-% My understanding of http://www.faqs.org/rfcs/rfc2616.html
-% says that we should not use Content-Length with a chunked
-% encoding. Turning this off makes libcurl happy, but I am
-% open to discussion.
-% {Content-Length, integer_to_list(couch_doc:bin_size(Bin))}
-]),
-couch_doc:bin_foldl(Bin,
-fun(BinSegment, []) -
-send_chunk(Resp, BinSegment),
-{ok, []}
-end,
-[]
-),
-send_chunk(Resp, )
-end;
-Error -
-throw(Error)
+#doc_query_args{
+rev=Rev, 
+options=Options
+} = parse_doc_query(Req),
+#doc{
+attachments=Attachments
+} = Doc = couch_doc_open(Db, DocId, Rev, Options),
+
+case proplists:get_value(FileName, Attachments) of
+undefined -
+throw({not_found, Document is missing attachment});
+{Type, Bin} -
+{ok, Resp} = start_chunked_response(Req, 200, [
+{ETag, couch_httpd:doc_etag(Doc)},
+{Cache-Control, must-revalidate},
+{Content-Type, binary_to_list(Type)}%,
+% My understanding of http://www.faqs.org/rfcs/rfc2616.html
+% says that we should not use Content-Length with a chunked
+% encoding. Turning this off makes libcurl happy, but I am
+% open to discussion.
+% {Content-Length, integer_to_list(couch_doc:bin_size(Bin))}
+]),
+couch_doc:bin_foldl(Bin,
+fun(BinSegment, []) -
+send_chunk(Resp, BinSegment),
+{ok, []}
+end,
+[]
+),
+send_chunk(Resp, )
 end;

svn commit: r774384 - in /couchdb/branches/0.9.x: ./ etc/default/couchdb src/couchdb/couch_rep.erl

2009-05-13 Thread kocolosk

Author: kocolosk
Date: Wed May 13 14:43:39 2009
New Revision: 774384

URL: http://svn.apache.org/viewvc?rev=774384view=rev
Log:
merged r771480 from trunk

Modified:
couchdb/branches/0.9.x/   (props changed)
couchdb/branches/0.9.x/etc/default/couchdb   (props changed)
couchdb/branches/0.9.x/src/couchdb/couch_rep.erl

Propchange: couchdb/branches/0.9.x/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 13 14:43:39 2009
@@ -1,3 +1,3 @@
 /couchdb/branches/design_resources:751716-751803
 /couchdb/branches/form:729440-730015
-/couchdb/trunk:758717,758723,758768,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762019,762153,762574,763816,763818,763833,764257,764835,765419-765420,765479,765819,766340,766347,766353,766358,766373,766383,766390,766392,766399,766406-766407,766456,766467,766476,766493,766505-766506,766751,766767,767164,767175-767176,767190,767204,767206,767208,767362,767398,767506,767543,768573,769109,769127,769181,769211,769792,769804,770782,771418,771466-771467,771472,772406,772415,772978,773225,773260,773319,773387,773401,774045,774095,774101,774180-774181
+/couchdb/trunk:758717,758723,758768,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762019,762153,762574,763816,763818,763833,764257,764835,765419-765420,765479,765819,766340,766347,766353,766358,766373,766383,766390,766392,766399,766406-766407,766456,766467,766476,766493,766505-766506,766751,766767,767164,767175-767176,767190,767204,767206,767208,767362,767398,767506,767543,768573,769109,769127,769181,769211,769792,769804,770782,771418,771466-771467,771472,771480,772406,772415,772978,773225,773260,773319,773387,773401,774045,774095,774101,774180-774181

Propchange: couchdb/branches/0.9.x/etc/default/couchdb
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 13 14:43:39 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,758723,758768,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762019,762153,762574,763816,763818,763833,764257,764835,765419-765420,765479,765819,766340,766347,766353,766358,766373,766383,766390,766392,766399,766406-766407,766456,766467,766476,766493,766505-766506,766751,766767,767164,767175-767176,767190,767204,767206,767208,767362,767398,767506,767543,768573,769109,769127,769181,769211,769792,769804,770782,771418,771466-771467,771472,772406,772415,772978,773225,773260,773319,773387,773401,774045,774095,774101,774180-774181
+/couchdb/trunk/etc/default/couchdb:758717,758723,758768,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762019,762153,762574,763816,763818,763833,764257,764835,765419-765420,765479,765819,766340,766347,766353,766358,766373,766383,766390,766392,766399,766406-766407,766456,766467,766476,766493,766505-766506,766751,766767,767164,767175-767176,767190,767204,767206,767208,767362,767398,767506,767543,768573,769109,769127,769181,769211,769792,769804,770782,771418,771466-771467,771472,771480,772406,772415,772978,773225,773260,773319,773387,773401,774045,774095,774101,774180-774181
 /incubator/couchdb/trunk/etc/default/couchdb:642419-694440

Modified: couchdb/branches/0.9.x/src/couchdb/couch_rep.erl
URL: 
http://svn.apache.org/viewvc/couchdb/branches/0.9.x/src/couchdb/couch_rep.erl?rev=774384r1=774383r2=774384view=diff
==
--- couchdb/branches/0.9.x/src/couchdb/couch_rep.erl (original)
+++ couchdb/branches/0.9.x/src/couchdb/couch_rep.erl Wed May 13 14:43:39 2009
@@ -369,10 +369,11 @@
 {ibrowse_async_response_end, ReqId} - ok
 end.
 
-attachment_stub_converter(DbS, Id, {Name, {stub, Type, Length}}) -
+attachment_stub_converter(DbS, Id, Rev, {Name, {stub, Type, Length}}) -
 #http_db{uri=DbUrl, headers=Headers} = DbS,
-% TODO worry about revisions
-Url = DbUrl ++ url_encode(Id) ++ / ++ url_encode(?b2l(Name)),
+{Pos, [RevId|_]} = Rev,
+Url = lists:flatten([DbUrl, url_encode(Id), /, url_encode(?b2l(Name)),
+?rev=, couch_doc:rev_to_str({Pos,RevId})]),
 ?LOG_DEBUG(Attachment URL ~p, [Url]),
 {ok, RcvFun} = make_attachment_stub_receiver(Url, Headers, Name, 
 Type, Length),
@@ -712,8 +713,9 @@
 fun({[{missing, Rev}]}) -
 {{not_found, missing}, couch_doc:parse_rev(Rev)};
 ({[{ok, JsonDoc}]}) -
-#doc{id=Id, attachments=Attach} = Doc = 
couch_doc:from_json_obj(JsonDoc),
-Attach2 = [attachment_stub_converter(DbS,Id,A) || A - Attach],
+#doc{id=Id, revs=Rev, attachments=Attach} = Doc =
+

svn commit: r774409 - in /couchdb/branches/0.9.x: ./ etc/default/couchdb

2009-05-13 Thread kocolosk

Author: kocolosk
Date: Wed May 13 15:49:54 2009
New Revision: 774409

URL: http://svn.apache.org/viewvc?rev=774409view=rev
Log:
fix mergeinfo for 765364 and 771474 ports

Modified:
couchdb/branches/0.9.x/   (props changed)
couchdb/branches/0.9.x/etc/default/couchdb   (props changed)

Propchange: couchdb/branches/0.9.x/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 13 15:49:54 2009
@@ -1,3 +1,3 @@
 /couchdb/branches/design_resources:751716-751803
 /couchdb/branches/form:729440-730015
-/couchdb/trunk:758717,758723,758768,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762019,762153,762574,763816,763818,763833,764257,764835,765419-765420,765479,765819,766338,766340,766347,766353,766358,766373,766383,766390,766392,766399,766406-766407,766456,766467,766476,766493,766505-766506,766751,766767,767164,767175-767176,767190,767204,767206,767208,767362,767398,767506,767543,768573,769109,769127,769181,769211,769792,769804,770782,771418,771466-771467,771472,771480,772406,772415,772978,773225,773260,773319,773387,773401,774045,774095,774101,774180-774181
+/couchdb/trunk:758717,758723,758768,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762019,762153,762574,763816,763818,763833,764257,764835,765364,765419-765420,765479,765819,766338,766340,766347,766353,766358,766373,766383,766390,766392,766399,766406-766407,766456,766467,766476,766493,766505-766506,766751,766767,767164,767175-767176,767190,767204,767206,767208,767362,767398,767506,767543,768573,769109,769127,769181,769211,769792,769804,770782,771418,771466-771467,771472,771474,771480,772406,772415,772978,773225,773260,773319,773387,773401,774045,774095,774101,774180-774181

Propchange: couchdb/branches/0.9.x/etc/default/couchdb
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 13 15:49:54 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,758723,758768,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762019,762153,762574,763816,763818,763833,764257,764835,765419-765420,765479,765819,766338,766340,766347,766353,766358,766373,766383,766390,766392,766399,766406-766407,766456,766467,766476,766493,766505-766506,766751,766767,767164,767175-767176,767190,767204,767206,767208,767362,767398,767506,767543,768573,769109,769127,769181,769211,769792,769804,770782,771418,771466-771467,771472,771480,772406,772415,772978,773225,773260,773319,773387,773401,774045,774095,774101,774180-774181
+/couchdb/trunk/etc/default/couchdb:758717,758723,758768,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762019,762153,762574,763816,763818,763833,764257,764835,765364,765419-765420,765479,765819,766338,766340,766347,766353,766358,766373,766383,766390,766392,766399,766406-766407,766456,766467,766476,766493,766505-766506,766751,766767,767164,767175-767176,767190,767204,767206,767208,767362,767398,767506,767543,768573,769109,769127,769181,769211,769792,769804,770782,771418,771466-771467,771472,771474,771480,772406,772415,772978,773225,773260,773319,773387,773401,774045,774095,774101,774180-774181
 /incubator/couchdb/trunk/etc/default/couchdb:642419-694440

svn commit: r774474 - in /couchdb/trunk: etc/couchdb/default.ini.tpl.in share/www/script/test/changes.js src/couchdb/couch_httpd_misc_handlers.erl src/couchdb/couch_query_servers.erl

2009-05-13 Thread damien

Author: damien
Date: Wed May 13 18:27:11 2009
New Revision: 774474

URL: http://svn.apache.org/viewvc?rev=774474view=rev
Log:
Adding testing for GET /_changes?continuous=true by adding a GET 
/_sleep?time=Msecs call, which allows the browser to process the waiting data 
on the other async XHR request.

Modified:
couchdb/trunk/etc/couchdb/default.ini.tpl.in
couchdb/trunk/share/www/script/test/changes.js
couchdb/trunk/src/couchdb/couch_httpd_misc_handlers.erl
couchdb/trunk/src/couchdb/couch_query_servers.erl

Modified: couchdb/trunk/etc/couchdb/default.ini.tpl.in
URL: 
http://svn.apache.org/viewvc/couchdb/trunk/etc/couchdb/default.ini.tpl.in?rev=774474r1=774473r2=774474view=diff
==
--- couchdb/trunk/etc/couchdb/default.ini.tpl.in (original)
+++ couchdb/trunk/etc/couchdb/default.ini.tpl.in Wed May 13 18:27:11 2009
@@ -60,6 +60,7 @@
 _restart = {couch_httpd_misc_handlers, handle_restart_req}
 _stats = {couch_httpd_stats_handlers, handle_stats_req}
 _log = {couch_httpd_misc_handlers, handle_log_req}
+_sleep = {couch_httpd_misc_handlers, handle_sleep_req}
 
 [httpd_db_handlers]
 _compact = {couch_httpd_db, handle_compact_req}

Modified: couchdb/trunk/share/www/script/test/changes.js
URL: 
http://svn.apache.org/viewvc/couchdb/trunk/share/www/script/test/changes.js?rev=774474r1=774473r2=774474view=diff
==
--- couchdb/trunk/share/www/script/test/changes.js (original)
+++ couchdb/trunk/share/www/script/test/changes.js Wed May 13 18:27:11 2009
@@ -10,29 +10,85 @@
 // License for the specific language governing permissions and limitations 
under
 // the License.
 
+
 couchTests.changes = function(debug) {
   var db = new CouchDB(test_suite_db);
   db.deleteDb();
   db.createDb();
   if (debug) debugger;
   
-  
-  var req = CouchDB.newXhr();
-  
-  req.open(GET, /test_suite_db/_changes, false);
-  req.send();
+  var req = CouchDB.request(GET, /test_suite_db/_changes);
   var resp = JSON.parse(req.responseText);
   
   T(resp.results.length == 0  resp.last_seq==0)
   
-  var doc = {_id:foo, bar:1};
-  db.save(doc);
+  var docFoo = {_id:foo, bar:1};
+  db.save(docFoo);
   
-  req.open(GET, /test_suite_db/_changes, false);
-  req.send();
+  req = CouchDB.request(GET, /test_suite_db/_changes);
   var resp = JSON.parse(req.responseText);
   
   T(resp.results.length == 1  resp.last_seq==1)
-  T(resp.results[0].changes[0].rev == doc._rev)
+  T(resp.results[0].changes[0].rev == docFoo._rev)
+  
+  var xhr;
+  
+  try {
+xhr = CouchDB.newXhr();
+  } catch (err) {  
+  }
+  
+  if (xhr) {
+// Only test the continuous stuff if we have a real XHR object
+// with real async support.
+
+var sleep = function(msecs) {
+  // by making a slow sync request, weallows the waiting XHR request data
+  // to be received.
+  var req = CouchDB.request(GET, /_sleep?time= + msecs);
+  T(JSON.parse(req.responseText).ok == true);
+}
+  
+var parse_changes_line = function(line) {
+  if (line.charAt(line.length-1) == ,) {
+line = line.substring(0, line.length-1);
+  }
+  return JSON.parse(line);
+}
+  
+xhr.open(GET, /test_suite_db/_changes?continuous=true, true);
+xhr.send();
+  
+var docBar = {_id:bar, bar:1};
+db.save(docBar);
+  
+sleep(100);
+var lines = xhr.responseText.split(\n);
+  
+T(lines[0]='{results:[');
+  
+var change = parse_changes_line(lines[1]);
+  
+T(change.seq == 1)
+T(change.id == foo)
+  
+change = parse_changes_line(lines[2]);
+  
+T(change.seq == 2)
+T(change.id == bar)
+T(change.changes[0].rev == docBar._rev)
+  
+var docBaz = {_id:baz, baz:1};
+db.save(docBaz);
+  
+sleep(100);
+var lines = xhr.responseText.split(\n);
+  
+change = parse_changes_line(lines[3]);
+  
+T(change.seq == 3);
+T(change.id == baz);
+T(change.changes[0].rev == docBaz._rev);
   
+  }
 };

Modified: couchdb/trunk/src/couchdb/couch_httpd_misc_handlers.erl
URL: 
http://svn.apache.org/viewvc/couchdb/trunk/src/couchdb/couch_httpd_misc_handlers.erl?rev=774474r1=774473r2=774474view=diff
==
--- couchdb/trunk/src/couchdb/couch_httpd_misc_handlers.erl (original)
+++ couchdb/trunk/src/couchdb/couch_httpd_misc_handlers.erl Wed May 13 18:27:11 
2009
@@ -15,7 +15,7 @@
 -export([handle_welcome_req/2,handle_favicon_req/2,handle_utils_dir_req/2,
 handle_all_dbs_req/1,handle_replicate_req/1,handle_restart_req/1,
 handle_uuids_req/1,handle_config_req/1,handle_log_req/1,
-handle_task_status_req/1]).
+handle_task_status_req/1,handle_sleep_req/1]).
 
 -export([increment_update_seq_req/2]).
 
@@ -56,6 +56,12 @@
 handle_utils_dir_req(Req, _) -
 send_method_not_allowed(Req, GET,HEAD).
 
+handle_sleep_req(#httpd{method='GET'}=Req) -
+Time =

svn commit: r774588 - in /couchdb/branches/0.9.x: ./ etc/default/couchdb share/www/script/futon.browse.js

2009-05-13 Thread davisp

Author: davisp
Date: Wed May 13 23:11:57 2009
New Revision: 774588

URL: http://svn.apache.org/viewvc?rev=774588view=rev
Log:
Backporting 774587 from trunk.


Modified:
couchdb/branches/0.9.x/   (props changed)
couchdb/branches/0.9.x/etc/default/couchdb   (props changed)
couchdb/branches/0.9.x/share/www/script/futon.browse.js

Propchange: couchdb/branches/0.9.x/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 13 23:11:57 2009
@@ -1,3 +1,3 @@
 /couchdb/branches/design_resources:751716-751803
 /couchdb/branches/form:729440-730015
-/couchdb/trunk:758717,758723,758768,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762019,762153,762574,763816,763818,763833,764257,764835,765364,765419-765420,765479,765819,766338,766340,766347,766353,766358,766373,766383,766390,766392,766399,766406-766407,766456,766467,766476,766493,766505-766506,766751,766767,767164,767175-767176,767190,767204,767206,767208,767362,767398,767506,767543,768573,769109,769127,769181,769211,769792,769804,770782,771418,771466-771467,771472,771474,771480,772406,772415,772978,773225,773260,773319,773387,773401,774045,774095,774101,774180-774181
+/couchdb/trunk:758717,758723,758768,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762019,762153,762574,763816,763818,763833,764257,764835,765364,765419-765420,765479,765819,766338,766340,766347,766353,766358,766373,766383,766390,766392,766399,766406-766407,766456,766467,766476,766493,766505-766506,766751,766767,767164,767175-767176,767190,767204,767206,767208,767362,767398,767506,767543,768573,769109,769127,769181,769211,769792,769804,770782,771418,771466-771467,771472,771474,771480,772406,772415,772978,773225,773260,773319,773387,773401,774045,774095,774101,774180-774181,774587

Propchange: couchdb/branches/0.9.x/etc/default/couchdb
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 13 23:11: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,758723,758768,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762019,762153,762574,763816,763818,763833,764257,764835,765364,765419-765420,765479,765819,766338,766340,766347,766353,766358,766373,766383,766390,766392,766399,766406-766407,766456,766467,766476,766493,766505-766506,766751,766767,767164,767175-767176,767190,767204,767206,767208,767362,767398,767506,767543,768573,769109,769127,769181,769211,769792,769804,770782,771418,771466-771467,771472,771474,771480,772406,772415,772978,773225,773260,773319,773387,773401,774045,774095,774101,774180-774181
+/couchdb/trunk/etc/default/couchdb:758717,758723,758768,758942,759588,760442,760503,760532-760533,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,762019,762153,762574,763816,763818,763833,764257,764835,765364,765419-765420,765479,765819,766338,766340,766347,766353,766358,766373,766383,766390,766392,766399,766406-766407,766456,766467,766476,766493,766505-766506,766751,766767,767164,767175-767176,767190,767204,767206,767208,767362,767398,767506,767543,768573,769109,769127,769181,769211,769792,769804,770782,771418,771466-771467,771472,771474,771480,772406,772415,772978,773225,773260,773319,773387,773401,774045,774095,774101,774180-774181,774587
 /incubator/couchdb/trunk/etc/default/couchdb:642419-694440

Modified: couchdb/branches/0.9.x/share/www/script/futon.browse.js
URL: 
http://svn.apache.org/viewvc/couchdb/branches/0.9.x/share/www/script/futon.browse.js?rev=774588r1=774587r2=774588view=diff
==
--- couchdb/branches/0.9.x/share/www/script/futon.browse.js [utf-8] (original)
+++ couchdb/branches/0.9.x/share/www/script/futon.browse.js [utf-8] Wed May 13 
23:11:57 2009
@@ -292,6 +292,10 @@
   }
 },
 success: function(resp) {
+  if(!resp.views || !resp.views[localViewName]) {
+$.cookies.remove(dbName + .view);
+location.href = database.html? + encodeURIComponent(db.name);
+  }
   var viewCode = resp.views[localViewName];
   page.viewLanguage = resp.language || javascript;
   $(#language).val(page.viewLanguage);

[Couchdb Wiki] Trivial Update of HTTP Bulk Document API by KevinIlchmannJørgensen

2009-05-13 Thread Apache Wiki

Dear Wiki user,

You have subscribed to a wiki page or wiki category on Couchdb Wiki for 
change notification.

The following page has been changed by KevinIlchmannJÃ¸rgensen:
http://wiki.apache.org/couchdb/HTTP_Bulk_Document_API

--
  For example (with curl):
  {{{
  $ DB=http://127.0.0.1:5984/mydb;
- $ curl -v -d 
'{docs:[{key:baz,name:bazzel},{key:bar,name:barry}]}' -X POST 
$DB/_bulk_doc
+ $ curl -v -d 
'{docs:[{key:baz,name:bazzel},{key:bar,name:barry}]}' -X POST 
$DB/_bulk_docs
- $ curl -v -d @your_file.json -X POST $DB/_bulk_doc 
+ $ curl -v -d @your_file.json -X POST $DB/_bulk_docs 
  }}}
  
  Doc formats below are as per CouchDB 0.9.x.

43 matches

Mail list logo