[couchdb] 02/02: Add custodian and recon deps

[ja...@apache.org]

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

jaydoane pushed a commit to branch cloudant/weatherreport
in repository https://gitbox.apache.org/repos/asf/couchdb.git

commit ce1b76d16e34433b0129c3f3d7d9ff760a646ce6
Author: Jay Doane <ja...@apache.org>
AuthorDate: Wed Aug 7 14:33:10 2019 -0700

    Add custodian and recon deps
---
 rebar.config.script | 5 ++++-
 rel/reltool.config  | 4 ++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/rebar.config.script b/rebar.config.script
index 847b434..fda15dc 100644
--- a/rebar.config.script
+++ b/rebar.config.script
@@ -157,7 +157,10 @@ DepDescs = [
 %%
 {weatherreport,    {url, "https://github.com/cloudant/weatherreport.git"},
                    {branch, "45918-pluggable-storage-engines"}}, % FIXME with proper tag
->>>>>>> Include weatherreport dependency
+{custodian,        {url, "https://github.com/cloudant/custodian.git"},
+                   {branch, "master"}}, % FIXME with proper tag
+{recon,            {url, "https://github.com/cloudant/recon.git"},
+                   {branch, "cloudant-local"}}, % FIXME with proper tag
 %% Third party deps
 {folsom,           "folsom",           {tag, "CouchDB-0.8.3"}},
 {hyper,            "hyper",            {tag, "CouchDB-2.2.0-6"}},
diff --git a/rel/reltool.config b/rel/reltool.config
index 79ead2c..60201ac 100644
--- a/rel/reltool.config
+++ b/rel/reltool.config
@@ -40,6 +40,7 @@
         couch_stats,
         couch_event,
         couch_peruser,
+        custodian,
         ddoc_cache,
         dreyfus,
         ets_lru,
@@ -56,6 +57,7 @@
         mango,
         mem3,
         mochiweb,
+        recon,
         rexi,
         setup,
         smoosh,
@@ -100,6 +102,7 @@
     {app, couch_stats, [{incl_cond, include}]},
     {app, couch_event, [{incl_cond, include}]},
     {app, couch_peruser, [{incl_cond, include}]},
+    {app, custodian, [{incl_cond, include}]},
     {app, ddoc_cache, [{incl_cond, include}]},
     {app, dreyfus, [{incl_cond, include}]},
     {app, ets_lru, [{incl_cond, include}]},
@@ -116,6 +119,7 @@
     {app, mango, [{incl_cond, include}]},
     {app, mem3, [{incl_cond, include}]},
     {app, mochiweb, [{incl_cond, include}]},
+    {app, recon, [{incl_cond, include}]},
     {app, rexi, [{incl_cond, include}]},
     {app, setup, [{incl_cond, include}]},
     {app, smoosh, [{incl_cond, include}]},