[couchdb] 01/01: Remove ioq/hqueue dependencies, add ioq as subdir

[ko...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

kocolosk pushed a commit to branch ioq-in-tree
in repository https://gitbox.apache.org/repos/asf/couchdb.git

commit 7c12f14679a7b91abe287cc10bf328a595bf8d33
Author: Adam Kocoloski <ko...@apache.org>
AuthorDate: Mon Jan 6 13:26:28 2020 -0500

    Remove ioq/hqueue dependencies, add ioq as subdir
    
    The hqueue dependency is only needed for experimental IOQ2 functionality
    that is not included in the codebase we're bringing into the mainline.
---
 rebar.config.script | 3 +--
 rel/reltool.config  | 2 --
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/rebar.config.script b/rebar.config.script
index dace4e2..5d5a6aa 100644
--- a/rebar.config.script
+++ b/rebar.config.script
@@ -131,6 +131,7 @@ SubDirs = [
     "src/dreyfus",
     "src/fabric",
     "src/global_changes",
+    "src/ioq",
     "src/ken",
     "src/mango",
     "src/rexi",
@@ -146,8 +147,6 @@ DepDescs = [
 {ets_lru,          "ets-lru",          {tag, "1.0.0"}},
 {khash,            "khash",            {tag, "1.0.1"}},
 {snappy,           "snappy",           {tag, "CouchDB-1.0.4"}},
-{ioq,              "ioq",              {tag, "2.1.2"}},
-{hqueue,           "hqueue",           {tag, "CouchDB-1.0.1-1"}},
 
 %% Non-Erlang deps
 {docs,             {url, "https://github.com/apache/couchdb-documentation"},
diff --git a/rel/reltool.config b/rel/reltool.config
index 512e45c..1be2ccc 100644
--- a/rel/reltool.config
+++ b/rel/reltool.config
@@ -47,7 +47,6 @@
         fabric,
         folsom,
         global_changes,
-        hqueue,
         hyper,
         ibrowse,
         ioq,
@@ -105,7 +104,6 @@
     {app, fabric, [{incl_cond, include}]},
     {app, folsom, [{incl_cond, include}]},
     {app, global_changes, [{incl_cond, include}]},
-    {app, hqueue, [{incl_cond, include}]},
     {app, hyper, [{incl_cond, include}]},
     {app, ibrowse, [{incl_cond, include}]},
     {app, ioq, [{incl_cond, include}]},