You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by jc...@apache.org on 2010/02/18 22:39:23 UTC
svn commit: r911604 - in /couchdb/branches/0.11.x: ./ etc/default/couchdb
share/server/loop.js
Author: jchris
Date: Thu Feb 18 21:39:23 2010
New Revision: 911604
URL: http://svn.apache.org/viewvc?rev=911604&view=rev
Log:
backport minor change in JSON sandbox from trunk r911602
Modified:
couchdb/branches/0.11.x/ (props changed)
couchdb/branches/0.11.x/etc/default/couchdb (props changed)
couchdb/branches/0.11.x/share/server/loop.js
Propchange: couchdb/branches/0.11.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Feb 18 21:39:23 2010
@@ -6,4 +6,4 @@
/couchdb/branches/list-iterator:782292-784593
/couchdb/branches/tail_header:775760-778477
/couchdb/tags/0.10.0:825400
-/couchdb/trunk:909247,910054,910696,910910-910911,911544,911559,911578
+/couchdb/trunk:909247,910054,910696,910910-910911,911544,911559,911578,911602
Propchange: couchdb/branches/0.11.x/etc/default/couchdb
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Feb 18 21:39:23 2010
@@ -6,5 +6,5 @@
/couchdb/branches/list-iterator/etc/default/couchdb:782292-784593
/couchdb/branches/tail_header/etc/default/couchdb:775760-778477
/couchdb/tags/0.10.0/etc/default/couchdb:825400
-/couchdb/trunk/etc/default/couchdb:909247,910054,910696,911544
+/couchdb/trunk/etc/default/couchdb:909247,910054,910696,911544,911602
/incubator/couchdb/trunk/etc/default/couchdb:642419-694440
Modified: couchdb/branches/0.11.x/share/server/loop.js
URL: http://svn.apache.org/viewvc/couchdb/branches/0.11.x/share/server/loop.js?rev=911604&r1=911603&r2=911604&view=diff
==============================================================================
--- couchdb/branches/0.11.x/share/server/loop.js (original)
+++ couchdb/branches/0.11.x/share/server/loop.js Thu Feb 18 21:39:23 2010
@@ -20,6 +20,7 @@
sandbox.sum = Views.sum;
sandbox.log = log;
sandbox.toJSON = Couch.toJSON;
+ sandbox.JSON = JSON;
sandbox.provides = Mime.provides;
sandbox.registerType = Mime.registerType;
sandbox.start = Render.start;