You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by wo...@apache.org on 2018/07/24 11:40:45 UTC

[couchdb] branch travis-20.3 updated (f440b23 -> 46aff89)

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

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


    from f440b23  bump docs dependency
     add b1fbbb1  Bump fauxton dependency
     new 46aff89  Merge branch 'master' into travis-20.3

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 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


[couchdb] 01/01: Merge branch 'master' into travis-20.3

Posted by wo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit 46aff89ecbf693501d521b5601300c8062b28228
Merge: f440b23 b1fbbb1
Author: Joan Touzet <wo...@users.noreply.github.com>
AuthorDate: Tue Jul 24 07:40:43 2018 -0400

    Merge branch 'master' into travis-20.3

 rebar.config.script | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --cc rebar.config.script
index db6b449,5b79a88..3fbc324
--- a/rebar.config.script
+++ b/rebar.config.script
@@@ -56,9 -56,9 +56,9 @@@ DepDescs = 
  
  %% Non-Erlang deps
  {docs,             {url, "https://github.com/apache/couchdb-documentation"},
 -                   {tag, "2.1.2"}, [raw]},
 +                   {tag, "2.2.0"}, [raw]},
  {fauxton,          {url, "https://github.com/apache/couchdb-fauxton"},
-                    {tag, "v1.1.15"}, [raw]},
+                    {tag, "v1.1.16"}, [raw]},
  %% Third party deps
  {folsom,           "folsom",           {tag, "CouchDB-0.8.2"}},
  {hyper,            "hyper",            {tag, "CouchDB-2.2.0-4"}},