Author: jan Date: Wed May 13 12:46:16 2009 New Revision: 774296 URL: http://svn.apache.org/viewvc?rev=774296&view=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=774296&r1=774295&r2=774296&view=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 };