[couchdb] branch master updated (dd1b281 -> e10498f)

[rn...@apache.org]

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

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


    from dd1b281  When shard splitting make sure to reset the targets before any retries
     add 8d92f21  Reset a view shard if the signature is wrong
     add c8a75fa  Debug mem3 eunit error
     new e10498f  Merge pull request #2438 from apache/reset-corrupt-view-index

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_mrview/src/couch_mrview_index.erl | 6 ++++++
 src/mem3/src/mem3_sync_event_listener.erl   | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

[couchdb] 01/01: Merge pull request #2438 from apache/reset-corrupt-view-index

[rn...@apache.org]

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

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

commit e10498f3c6acc6703b353a535ee5c21222cd0bd3
Merge: dd1b281 c8a75fa
Author: Robert Newson <rn...@apache.org>
AuthorDate: Sat Jan 11 10:15:20 2020 +0000

    Merge pull request #2438 from apache/reset-corrupt-view-index
    
    Reset a view shard if the signature is wrong

 src/couch_mrview/src/couch_mrview_index.erl | 6 ++++++
 src/mem3/src/mem3_sync_event_listener.erl   | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)