[couchdb] branch main updated (753fc9a -> 647fd16)

[rn...@apache.org]

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

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


    from 753fc9a  Merge pull request #3248 from apache/changes_filter_all_docs_oom_main
     add 475ff60  Add an "encryption" object to db info
     new 647fd16  Merge pull request #3244 from apache/aegis_db_info

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/aegis/src/aegis.erl              | 11 +++++++++++
 src/aegis/src/aegis_key_manager.erl  |  8 ++++++++
 src/aegis/test/aegis_server_test.erl |  7 +++++++
 src/fabric/src/fabric2_fdb.erl       |  4 +++-
 4 files changed, 29 insertions(+), 1 deletion(-)

[couchdb] 01/01: Merge pull request #3244 from apache/aegis_db_info

[rn...@apache.org]

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

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

commit 647fd162cc64939b260ab61f8af117c26fd5b814
Merge: 753fc9a 475ff60
Author: Robert Newson <rn...@apache.org>
AuthorDate: Fri Nov 6 19:18:28 2020 +0000

    Merge pull request #3244 from apache/aegis_db_info
    
    Add an "encryption" object to db info

 src/aegis/src/aegis.erl              | 11 +++++++++++
 src/aegis/src/aegis_key_manager.erl  |  8 ++++++++
 src/aegis/test/aegis_server_test.erl |  7 +++++++
 src/fabric/src/fabric2_fdb.erl       |  4 +++-
 4 files changed, 29 insertions(+), 1 deletion(-)