You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by kx...@apache.org on 2015/02/09 21:00:58 UTC

[57/57] [abbrv] couchdb commit: updated refs/heads/developer-preview-2.0 to 849b334

add mango


Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/849b3349
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/849b3349
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/849b3349

Branch: refs/heads/developer-preview-2.0
Commit: 849b3349ae21dfa7920f46dffcbe485c299cf061
Parents: c28eadc
Author: Jan Lehnardt <ja...@apache.org>
Authored: Sun Feb 8 14:25:57 2015 +0100
Committer: Jan Lehnardt <ja...@apache.org>
Committed: Sun Feb 8 16:30:14 2015 +0100

----------------------------------------------------------------------
 rebar.config.script         | 1 +
 rel/overlay/etc/default.ini | 3 +++
 rel/reltool.config          | 2 ++
 3 files changed, 6 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb/blob/849b3349/rebar.config.script
----------------------------------------------------------------------
diff --git a/rebar.config.script b/rebar.config.script
index ef4b5b0..c71ed6c 100644
--- a/rebar.config.script
+++ b/rebar.config.script
@@ -42,6 +42,7 @@ DepDescs = [
     {ioq,               "ioq",              {branch, "master"}},
     {jiffy,             "jiffy",            {branch, "master"}},
     {khash,             "khash",            {branch, "master"}},
+    {mango,             "mango",            {branch, "master"}},
     {mem3,              "mem3",             {branch, "master"}},
     {mochiweb,          "mochiweb",         {branch, "master"}},
     {oauth,             "oauth",            {branch, "master"}},

http://git-wip-us.apache.org/repos/asf/couchdb/blob/849b3349/rel/overlay/etc/default.ini
----------------------------------------------------------------------
diff --git a/rel/overlay/etc/default.ini b/rel/overlay/etc/default.ini
index 68e5f1d..2b7a5c2 100644
--- a/rel/overlay/etc/default.ini
+++ b/rel/overlay/etc/default.ini
@@ -136,6 +136,9 @@ use_users_db = false
 javascript = {{prefix}}/bin/couchjs {{prefix}}/share/server/main.js
 coffeescript = {{prefix}}/bin/couchjs {{prefix}}/share/server/main-coffee.js
 
+; enable mango query engine
+[native_query_servers]
+query = {mango_native_proc, start_link, []}
 
 ; Changing reduce_limit to false will disable reduce_limit.
 ; If you think you're hitting reduce_limit with a "good" reduce function,

http://git-wip-us.apache.org/repos/asf/couchdb/blob/849b3349/rel/reltool.config
----------------------------------------------------------------------
diff --git a/rel/reltool.config b/rel/reltool.config
index a2564d6..c02664b 100644
--- a/rel/reltool.config
+++ b/rel/reltool.config
@@ -52,6 +52,7 @@
         jiffy,
         khash,
         lager,
+        mango,
         mem3,
         mochiweb,
         oauth,
@@ -106,6 +107,7 @@
     {app, jiffy, [{incl_cond, include}]},
     {app, khash, [{incl_cond, include}]},
     {app, lager, [{incl_cond, include}]},
+    {app, mango, [{incl_cond, include}]},
     {app, mem3, [{incl_cond, include}]},
     {app, mochiweb, [{incl_cond, include}]},
     {app, oauth, [{incl_cond, include}]},