[couchdb] branch import-setup-again updated (423597e -> 0b69b1d)

[wo...@apache.org]

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

wohali pushed a change to branch import-setup-again
in repository https://gitbox.apache.org/repos/asf/couchdb.git.


    omit 423597e  Remove couchdb-setup from rebar.config.script
     new 0b69b1d  Remove couchdb-setup from rebar.config.script

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (423597e)
            \
             N -- N -- N   refs/heads/import-setup-again (0b69b1d)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

The 1 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.


Summary of changes:
 .gitignore          | 1 -
 rebar.config.script | 3 ++-
 2 files changed, 2 insertions(+), 2 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
wohali@apache.org.

[couchdb] 01/01: Remove couchdb-setup from rebar.config.script

[wo...@apache.org]

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

wohali pushed a commit to branch import-setup-again
in repository https://gitbox.apache.org/repos/asf/couchdb.git

commit 0b69b1da391f7ff5e47e191cd331ca60061a1d03
Author: Joan Touzet <jo...@atypical.net>
AuthorDate: Mon Mar 26 18:40:39 2018 -0400

    Remove couchdb-setup from rebar.config.script
---
 .gitignore          | 1 -
 rebar.config.script | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 3f5c4b2..a1a3040 100644
--- a/.gitignore
+++ b/.gitignore
@@ -52,7 +52,6 @@ src/meck/
 src/mochiweb/
 src/oauth/
 src/rebar/
-src/setup/
 src/snappy/
 tmp/
 
diff --git a/rebar.config.script b/rebar.config.script
index 4f6f82d..7d9b7fe 100644
--- a/rebar.config.script
+++ b/rebar.config.script
@@ -41,6 +41,7 @@ SubDirs = [
     "src/mango",
     "src/mem3",
     "src/rexi",
+    "src/setup",
     "rel"
 ],
 
@@ -51,7 +52,6 @@ DepDescs = [
 {ets_lru,          "ets-lru",          {tag, "1.0.0"}},
 {khash,            "khash",            {tag, "1.0.1"}},
 {snappy,           "snappy",           {tag, "CouchDB-1.0.0"}},
-{setup,            "setup",            {tag, "1.0.1"}},
 {ioq,              "ioq",              {tag, "1.0.1"}},
 
 %% Non-Erlang deps
@@ -100,7 +100,7 @@ AddConfig = [
         {plt_location, COUCHDB_ROOT},
         {plt_extra_apps, [
             asn1, bcrypt, compiler, crypto, inets, kernel, os_mon, runtime_tools,
-            sasl, ssl, stdlib, syntax_tools, xmerl]},
+            sasl, setup, ssl, stdlib, syntax_tools, xmerl]},
         {warnings, [unmatched_returns, error_handling, race_conditions]}]},
     {post_hooks, [{compile, "escript support/build_js.escript"}]}
 ],

-- 
To stop receiving notification emails like this one, please contact
wohali@apache.org.