summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Lehnardt <jan@apache.org>2015-02-08 14:25:57 +0100
committerJan Lehnardt <jan@apache.org>2015-02-08 14:43:46 +0100
commitafc4b3d80c28902b3395d78872c85731ed2238dc (patch)
treeb46106e1323d15c9e11c68ce261ffdbe4ae90e87
parentc28eadc025120b833db5526f142742f548a27d81 (diff)
downloadcouchdb-mango.tar.gz
add mangomango
-rw-r--r--rebar.config.script3
-rw-r--r--rel/overlay/etc/default.ini3
-rw-r--r--rel/reltool.config2
3 files changed, 7 insertions, 1 deletions
diff --git a/rebar.config.script b/rebar.config.script
index ef4b5b09b..75126c983 100644
--- a/rebar.config.script
+++ b/rebar.config.script
@@ -21,7 +21,7 @@ DepDescs = [
{cassim, "cassim", {branch, "master"}},
{couch_log, "couch-log", {branch, "master"}},
{config, "config", {branch, "master"}},
- {chttpd, "chttpd", {branch, "master"}},
+ {chttpd, "chttpd", {branch, "mango"}},
{couch, "couch", {branch, "master"}},
{couch_index, "couch-index", {branch, "master"}},
{couch_mrview, "couch-mrview", {branch, "master"}},
@@ -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"}},
diff --git a/rel/overlay/etc/default.ini b/rel/overlay/etc/default.ini
index 68e5f1d3b..2b7a5c2d4 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,
diff --git a/rel/reltool.config b/rel/reltool.config
index a2564d688..c02664b9d 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}]},