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 2021/10/11 19:32:51 UTC
[couchdb] branch cloudant/weatherreport created (now ce1b76d)
This is an automated email from the ASF dual-hosted git repository.
jaydoane pushed a change to branch cloudant/weatherreport
in repository https://gitbox.apache.org/repos/asf/couchdb.git.
at ce1b76d Add custodian and recon deps
This branch includes the following new commits:
new 3523750 Include weatherreport dependency
new ce1b76d Add custodian and recon deps
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[couchdb] 02/02: Add custodian and recon deps
Posted by 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}]},
[couchdb] 01/02: Include weatherreport dependency
Posted by 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 35237509251049b7331de0faaa74ac5c91fb634f
Author: Jay Doane <ja...@apache.org>
AuthorDate: Tue Aug 6 15:49:01 2019 -0700
Include weatherreport dependency
---
rebar.config.script | 4 ++++
rel/reltool.config | 8 +++++---
2 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/rebar.config.script b/rebar.config.script
index 1ffbf70..847b434 100644
--- a/rebar.config.script
+++ b/rebar.config.script
@@ -154,6 +154,10 @@ DepDescs = [
{tag, "3.1.1-RC2"}, [raw]},
{fauxton, {url, "https://github.com/apache/couchdb-fauxton"},
{tag, "v1.2.6"}, [raw]},
+%%
+{weatherreport, {url, "https://github.com/cloudant/weatherreport.git"},
+ {branch, "45918-pluggable-storage-engines"}}, % FIXME with proper tag
+>>>>>>> Include weatherreport dependency
%% 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 b58e400..79ead2c 100644
--- a/rel/reltool.config
+++ b/rel/reltool.config
@@ -61,7 +61,8 @@
smoosh,
snappy,
%% extra
- recon
+ recon,
+ weatherreport
]},
{rel, "start_clean", "", [kernel, stdlib]},
{boot_rel, "couchdb"},
@@ -119,9 +120,9 @@
{app, setup, [{incl_cond, include}]},
{app, smoosh, [{incl_cond, include}]},
{app, snappy, [{incl_cond, include}]},
-
%% extra
- {app, recon, [{incl_cond, include}]}
+ {app, recon, [{incl_cond, include}]},
+ {app, weatherreport, [{incl_cond, include}]}
]}.
{overlay_vars, "couchdb.config"}.
@@ -133,6 +134,7 @@
{copy, "../src/couch/priv/couchjs", "bin/couchjs"},
{copy, "../share/server/main.js", "share/server/main.js"},
{copy, "../share/server/main-coffee.js", "share/server/main-coffee.js"},
+ {copy, "../src/weatherreport/weatherreport", "bin/weatherreport"},
{copy, "files/sys.config", "releases/\{\{rel_vsn\}\}/sys.config"},
{copy, "files/vm.args", "releases/\{\{rel_vsn\}\}/vm.args"},
{template, "overlay/etc/default.ini", "etc/default.ini"},