This is an automated email from the ASF dual-hosted git repository. wohali pushed a commit to branch 2.1.x in repository https://gitbox.apache.org/repos/asf/couchdb.git
commit e01f3009b59a00d81dd1f6d4e807afab08b2d072 Author: Paul J. Davis <[email protected]> AuthorDate: Mon Oct 30 16:47:06 2017 -0500 Update jiffy to use dedupe_keys --- rebar.config.script | 2 +- src/couch/src/couch_util.erl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/rebar.config.script b/rebar.config.script index ee63aef..cdd80e4 100644 --- a/rebar.config.script +++ b/rebar.config.script @@ -62,7 +62,7 @@ DepDescs = [ %% Third party deps {folsom, "folsom", {tag, "CouchDB-0.8.2"}}, {ibrowse, "ibrowse", {tag, "CouchDB-4.0.1"}}, -{jiffy, "jiffy", {tag, "CouchDB-0.14.11-1"}}, +{jiffy, "jiffy", {tag, "CouchDB-0.14.11-2"}}, {mochiweb, "mochiweb", {tag, "CouchDB-2.12.0-1"}}, {meck, "meck", {tag, "0.8.8"}} diff --git a/src/couch/src/couch_util.erl b/src/couch/src/couch_util.erl index 4d3d73d..b8a0b62 100644 --- a/src/couch/src/couch_util.erl +++ b/src/couch/src/couch_util.erl @@ -426,7 +426,7 @@ json_encode(V) -> json_decode(V) -> try - jiffy:decode(V) + jiffy:decode(V, [dedupe_keys]) catch throw:Error -> throw({invalid_json, Error}) -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
