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 2020/01/31 18:57:02 UTC

[couchdb] branch master updated (6fd8159 -> 96e90c4)

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

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


    from 6fd8159  Stop propagating RC tags into dist archive (#2506)
     new f93d1a7  Update dependencies for 3.0
     new 96e90c4  Jiffy exceptions are errors now

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.


Summary of changes:
 rebar.config.script          | 4 ++--
 src/couch/src/couch_util.erl | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)


[couchdb] 01/02: Update dependencies for 3.0

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

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

commit f93d1a72de07bfe02f7a3b17b1816196c616ae1f
Author: Paul J. Davis <pa...@gmail.com>
AuthorDate: Sun Jan 5 13:52:50 2020 -0600

    Update dependencies for 3.0
    
    * b64url 1.0.1 -> 1.0.2
    * jiffy CouchDB-0.14.11-2 -> CouchDB-1.0.1-1
---
 rebar.config.script | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rebar.config.script b/rebar.config.script
index d356ac2..ace09ae 100644
--- a/rebar.config.script
+++ b/rebar.config.script
@@ -143,7 +143,7 @@ SubDirs = [
 DepDescs = [
 %% Independent Apps
 {config,           "config",           {tag, "2.1.7"}},
-{b64url,           "b64url",           {tag, "1.0.1"}},
+{b64url,           "b64url",           {tag, "1.0.2"}},
 {ets_lru,          "ets-lru",          {tag, "1.1.0"}},
 {khash,            "khash",            {tag, "1.1.0"}},
 {snappy,           "snappy",           {tag, "CouchDB-1.0.4"}},
@@ -157,7 +157,7 @@ DepDescs = [
 {folsom,           "folsom",           {tag, "CouchDB-0.8.3"}},
 {hyper,            "hyper",            {tag, "CouchDB-2.2.0-6"}},
 {ibrowse,          "ibrowse",          {tag, "CouchDB-4.0.1-1"}},
-{jiffy,            "jiffy",            {tag, "CouchDB-0.14.11-2"}},
+{jiffy,            "jiffy",            {tag, "CouchDB-1.0.1-1"}},
 {mochiweb,         "mochiweb",         {tag, "v2.20.0"}},
 {meck,             "meck",             {tag, "0.8.8"}}
 ],


[couchdb] 02/02: Jiffy exceptions are errors now

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

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

commit 96e90c44eb9bf70a3d05fbb6e9f637ca88a2745a
Author: Paul J. Davis <pa...@gmail.com>
AuthorDate: Fri Jan 31 12:29:18 2020 -0600

    Jiffy exceptions are errors now
    
    Jiffy changed its exception type in 1.0 to match the standard Erlang
    style for exceptions that cross an API boundary.
---
 src/couch/src/couch_util.erl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/couch/src/couch_util.erl b/src/couch/src/couch_util.erl
index 180db95..a785e2e 100644
--- a/src/couch/src/couch_util.erl
+++ b/src/couch/src/couch_util.erl
@@ -501,7 +501,7 @@ json_decode(V) ->
     try
         jiffy:decode(V, [dedupe_keys])
     catch
-        throw:Error ->
+        error:Error ->
             throw({invalid_json, Error})
     end.