Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id B9DB7200D55 for ; Wed, 1 Nov 2017 03:52:19 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id B8A86160BF9; Wed, 1 Nov 2017 02:52:19 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id CA39C160BFB for ; Wed, 1 Nov 2017 03:52:18 +0100 (CET) Received: (qmail 64397 invoked by uid 500); 1 Nov 2017 02:52:18 -0000 Mailing-List: contact commits-help@couchdb.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@couchdb.apache.org Delivered-To: mailing list commits@couchdb.apache.org Received: (qmail 64290 invoked by uid 99); 1 Nov 2017 02:52:17 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Nov 2017 02:52:17 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id C32F48796E; Wed, 1 Nov 2017 02:52:14 +0000 (UTC) Date: Wed, 01 Nov 2017 02:52:29 +0000 To: "commits@couchdb.apache.org" Subject: [couchdb] 16/19: Update jiffy to use dedupe_keys MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit From: wohali@apache.org In-Reply-To: <150950473377.30664.8382891356981763549@gitbox.apache.org> References: <150950473377.30664.8382891356981763549@gitbox.apache.org> X-Git-Host: gitbox.apache.org X-Git-Repo: couchdb X-Git-Refname: refs/heads/2.1.x X-Git-Reftype: branch X-Git-Rev: e01f3009b59a00d81dd1f6d4e807afab08b2d072 X-Git-NotificationType: diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated Message-Id: <20171101025214.C32F48796E@gitbox.apache.org> archived-at: Wed, 01 Nov 2017 02:52:19 -0000 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 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 "commits@couchdb.apache.org" .