You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by wo...@apache.org on 2018/07/13 20:53:21 UTC
[couchdb] 01/01: Merge branch 'master' into drop-r16
This is an automated email from the ASF dual-hosted git repository.
wohali pushed a commit to branch drop-r16
in repository https://gitbox.apache.org/repos/asf/couchdb.git
commit 4118747ee58c501b6a7518f47728cad974b0d31a
Merge: 42db919 a5858b9
Author: Joan Touzet <wo...@users.noreply.github.com>
AuthorDate: Fri Jul 13 16:53:19 2018 -0400
Merge branch 'master' into drop-r16
Jenkinsfile | 4 +-
rel/overlay/etc/default.ini | 5 +
src/chttpd/src/chttpd_auth.erl | 4 +
src/couch/src/couch_db_updater.erl | 13 +-
src/couch/src/couch_key_tree.erl | 13 --
src/couch/src/test_engine_util.erl | 3 +-
src/couch/test/couch_key_tree_tests.erl | 177 +++++++++------------
src/couch_mrview/src/couch_mrview_compactor.erl | 2 +
src/fabric/src/fabric_db_delete.erl | 6 +-
src/mango/src/mango_cursor_view.erl | 8 +-
src/mango/test/19-find-conflicts.py | 41 +++++
src/mango/test/mango.py | 5 +
test/javascript/run | 8 +-
.../with-quorum/{db-creation.js => attachments.js} | 29 ++--
.../{db-creation.js => attachments_delete.js} | 25 +--
.../attachments_delete_overridden_quorum.js | 36 +++++
.../with-quorum/attachments_overridden_quorum.js | 40 +++++
.../with-quorum/{db-creation.js => db_creation.js} | 0
...reation.js => db_creation_overridden_quorum.js} | 11 +-
.../db-creation.js => with-quorum/db_deletion.js} | 16 +-
...reation.js => db_deletion_overridden_quorum.js} | 14 +-
.../with-quorum/{db-creation.js => doc_bulk.js} | 20 ++-
...b-creation.js => doc_bulk_overridden_quorum.js} | 20 ++-
.../with-quorum/{db-creation.js => doc_copy.js} | 20 +--
...b-creation.js => doc_copy_overridden_quorum.js} | 23 +--
.../with-quorum/{db-creation.js => doc_crud.js} | 24 +--
...b-creation.js => doc_crud_overridden_quorum.js} | 24 +--
.../tests-cluster/without-quorum/attachments.js | 39 +++++
.../without-quorum/attachments_delete.js | 37 +++++
.../attachments_delete_overridden_quorum.js | 36 +++++
.../attachments_overridden_quorum.js | 42 +++++
.../{db-creation.js => db_creation.js} | 3 +-
...reation.js => db_creation_overridden_quorum.js} | 12 +-
.../{db-creation.js => db_deletion.js} | 18 ++-
...reation.js => db_deletion_overridden_quorum.js} | 15 +-
.../without-quorum/{db-creation.js => doc_bulk.js} | 20 +--
...b-creation.js => doc_bulk_overridden_quorum.js} | 20 +--
.../without-quorum/{db-creation.js => doc_copy.js} | 20 +--
...b-creation.js => doc_copy_overridden_quorum.js} | 23 +--
.../without-quorum/{db-creation.js => doc_crud.js} | 25 +--
...b-creation.js => doc_crud_overridden_quorum.js} | 24 +--
41 files changed, 610 insertions(+), 315 deletions(-)