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

[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 3c8490e  Merge pull request #3249 from apache/changes_filter_all_docs_oom_3.x
     add 0a66d5b  add remonitor code to DOWN message (#3144)
     add ca9df69  fix race condition (#3150)
     new c563243  Merge pull request #3250 from apache/3.x-re-monitor-compaction-pid

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_db.erl        |  9 +++++++++
 src/smoosh/src/smoosh_channel.erl | 31 +++++++++++++++++++++++++------
 2 files changed, 34 insertions(+), 6 deletions(-)

[couchdb] 01/01: Merge pull request #3250 from apache/3.x-re-monitor-compaction-pid

[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 c563243e49548aff7c551484f3713f948a8d8a75
Merge: 3c8490e ca9df69
Author: Peng Hui Jiang <ji...@cn.ibm.com>
AuthorDate: Sat Nov 7 09:20:27 2020 +0800

    Merge pull request #3250 from apache/3.x-re-monitor-compaction-pid
    
    3.x porting - add remonitor code to DOWN message (#3144)

 src/couch/src/couch_db.erl        |  9 +++++++++
 src/smoosh/src/smoosh_channel.erl | 31 +++++++++++++++++++++++++------
 2 files changed, 34 insertions(+), 6 deletions(-)