[couchdb] branch smoosh-in-tree updated (34b485d -> 02b9f25)

[ko...@apache.org]

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

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


    omit 34b485d  Remove smoosh as dependency
     new 02b9f25  Remove smoosh as dependency and add as subdir

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   (34b485d)
            \
             N -- N -- N   refs/heads/smoosh-in-tree (02b9f25)

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:
 rebar.config.script | 1 +
 1 file changed, 1 insertion(+)

[couchdb] 01/01: Remove smoosh as dependency and add as subdir

[ko...@apache.org]

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

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

commit 02b9f25f62691a377b4e37a98c33e3ce2e2678f1
Author: Adam Kocoloski <ko...@apache.org>
AuthorDate: Fri Nov 22 10:15:47 2019 -0500

    Remove smoosh as dependency and add as subdir
---
 rebar.config.script | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rebar.config.script b/rebar.config.script
index ba4e564..3aa3e17 100644
--- a/rebar.config.script
+++ b/rebar.config.script
@@ -91,6 +91,7 @@ SubDirs = [
     "src/mango",
     "src/rexi",
     "src/setup",
+    "src/smoosh",
     "rel"
 ],
 
@@ -103,7 +104,6 @@ DepDescs = [
 {snappy,           "snappy",           {tag, "CouchDB-1.0.4"}},
 {ioq,              "ioq",              {tag, "2.1.2"}},
 {hqueue,           "hqueue",           {tag, "1.0.1"}},
-{smoosh,           "smoosh",           {tag, "1.0.1"}},
 {ken,              "ken",              {tag, "1.0.6"}},
 
 %% Non-Erlang deps