[couchdb] branch master updated (a0f6041 -> 3ef0b37)

[ji...@apache.org]

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

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


    from a0f6041  Merge pull request #1657 from apache/COUCHDB-3326-upgrade-users-db
     add bb28567  Fix test failure on upgrade_v5_test
     new 3ef0b37  Merge pull request #1660 from apache/fix-upgrade_v5_test

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_bt_engine_header.erl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

[couchdb] 01/01: Merge pull request #1660 from apache/fix-upgrade_v5_test

[ji...@apache.org]

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

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

commit 3ef0b37792811f2c94bbae96d7b9df5105a5cc0a
Merge: a0f6041 bb28567
Author: Peng Hui Jiang <ji...@apache.org>
AuthorDate: Wed Oct 17 21:29:40 2018 +0800

    Merge pull request #1660 from apache/fix-upgrade_v5_test
    
    Fix test failure on upgrade_v5_test

 src/couch/src/couch_bt_engine_header.erl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)