[couchdb] branch prototype/fdb-layer updated (22d857d -> e0bcb2a)

[rn...@apache.org]

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

rnewson pushed a change to branch prototype/fdb-layer
in repository https://gitbox.apache.org/repos/asf/couchdb.git.


    from 22d857d  Merge pull request #3053 from apache/aegis_key_manager_app
     add 683335c  Validate the result from collate_fun
     new e0bcb2a  Merge pull request #3055 from apache/prototype/fdb-layer-ebtree-collate-validate

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/ebtree/src/ebtree.erl | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

[couchdb] 01/01: Merge pull request #3055 from apache/prototype/fdb-layer-ebtree-collate-validate

[rn...@apache.org]

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

rnewson pushed a commit to branch prototype/fdb-layer
in repository https://gitbox.apache.org/repos/asf/couchdb.git

commit e0bcb2a5ebbe23f4c04c9c19dbdbde692bef8fde
Merge: 22d857d 683335c
Author: Robert Newson <rn...@apache.org>
AuthorDate: Tue Aug 4 21:40:59 2020 +0100

    Merge pull request #3055 from apache/prototype/fdb-layer-ebtree-collate-validate
    
    Validate the result from collate_fun

 src/ebtree/src/ebtree.erl | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)