You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by ja...@apache.org on 2015/02/08 14:43:50 UTC
couchdb commit: updated refs/heads/mango to afc4b3d
Repository: couchdb
Updated Branches:
refs/heads/mango d7e70de23 -> afc4b3d80 (forced update)
add mango
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/afc4b3d8
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/afc4b3d8
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/afc4b3d8
Branch: refs/heads/mango
Commit: afc4b3d80c28902b3395d78872c85731ed2238dc
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 14:43:46 2015 +0100
----------------------------------------------------------------------
rebar.config.script | 3 ++-
rel/overlay/etc/default.ini | 3 +++
rel/reltool.config | 2 ++
3 files changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/afc4b3d8/rebar.config.script
----------------------------------------------------------------------
diff --git a/rebar.config.script b/rebar.config.script
index ef4b5b0..75126c9 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"}},
http://git-wip-us.apache.org/repos/asf/couchdb/blob/afc4b3d8/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/afc4b3d8/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}]},