[couchdb] branch 3.x updated (c563243 -> 94fec08)

[ji...@apache.org]

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

jiangphcn pushed a change to branch 3.x
in repository https://gitbox.apache.org/repos/asf/couchdb.git.


    from c563243  Merge pull request #3250 from apache/3.x-re-monitor-compaction-pid
     add c5b5efb  Expose `couch_util:decode/2` to support jiffy options
     new 94fec08  Merge pull request #3252 from apache/port-json-decode-2

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:
 src/couch/src/couch_util.erl              | 7 +++++--
 src/couch/test/eunit/couch_util_tests.erl | 7 +++++++
 2 files changed, 12 insertions(+), 2 deletions(-)

[couchdb] 01/01: Merge pull request #3252 from apache/port-json-decode-2

[ji...@apache.org]

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

jiangphcn pushed a commit to branch 3.x
in repository https://gitbox.apache.org/repos/asf/couchdb.git

commit 94fec089529a420e693e7c0f54d179b179013293
Merge: c563243 c5b5efb
Author: Peng Hui Jiang <ji...@cn.ibm.com>
AuthorDate: Mon Nov 9 10:01:17 2020 +0800

    Merge pull request #3252 from apache/port-json-decode-2
    
    Expose `couch_util:json_decode/2` to support jiffy options

 src/couch/src/couch_util.erl              | 7 +++++--
 src/couch/test/eunit/couch_util_tests.erl | 7 +++++++
 2 files changed, 12 insertions(+), 2 deletions(-)