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:20 UTC
[couchdb] branch drop-r16 updated (42db919 -> 4118747)
This is an automated email from the ASF dual-hosted git repository.
wohali pushed a change to branch drop-r16
in repository https://gitbox.apache.org/repos/asf/couchdb.git.
from 42db919 Drop Erlang R16 support
add 7dfed0c Added tests for checking http status code depending on cluster quorum
add bfc610f Make stem_interactive_updates option work again
add 80e431f Fix for issue #1136 - Error 500 deleting DB without quorum
add 177c22d Deletion responds 200 after a response from every node, and 202 in other case
add 71cf9f4 Adjust deletion tests in different cluster quorum conditions
add 45a0ad9 Add `conflicts: true` option to mango selectors
add 572234f Add tests for mango conflict finding
add e928b88 hook up proxy auth handler to chttpd
add aa73e4e Views now retain update_seq after compaction.
add a5858b9 Replace R16B03 with 17.5.3 for PR#1427
new 4118747 Merge branch 'master' into drop-r16
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:
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/attachments.js} | 30 ++--
.../with-quorum/attachments_delete.js} | 28 ++--
.../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 +--
.../with-quorum/doc_copy_overridden_quorum.js} | 26 ++-
.../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, 600 insertions(+), 332 deletions(-)
create mode 100644 src/mango/test/19-find-conflicts.py
copy test/javascript/{tests/large_docs.js => tests-cluster/with-quorum/attachments.js} (54%)
copy test/javascript/{tests/large_docs.js => tests-cluster/with-quorum/attachments_delete.js} (57%)
create mode 100644 test/javascript/tests-cluster/with-quorum/attachments_delete_overridden_quorum.js
create mode 100644 test/javascript/tests-cluster/with-quorum/attachments_overridden_quorum.js
copy test/javascript/tests-cluster/with-quorum/{db-creation.js => db_creation.js} (100%)
copy test/javascript/tests-cluster/with-quorum/{db-creation.js => db_creation_overridden_quorum.js} (62%)
copy test/javascript/tests-cluster/{without-quorum/db-creation.js => with-quorum/db_deletion.js} (70%)
copy test/javascript/tests-cluster/with-quorum/{db-creation.js => db_deletion_overridden_quorum.js} (67%)
copy test/javascript/tests-cluster/with-quorum/{db-creation.js => doc_bulk.js} (70%)
copy test/javascript/tests-cluster/with-quorum/{db-creation.js => doc_bulk_overridden_quorum.js} (63%)
copy test/javascript/tests-cluster/with-quorum/{db-creation.js => doc_copy.js} (70%)
copy test/javascript/{tests/large_docs.js => tests-cluster/with-quorum/doc_copy_overridden_quorum.js} (55%)
copy test/javascript/tests-cluster/with-quorum/{db-creation.js => doc_crud.js} (68%)
rename test/javascript/tests-cluster/with-quorum/{db-creation.js => doc_crud_overridden_quorum.js} (55%)
create mode 100644 test/javascript/tests-cluster/without-quorum/attachments.js
create mode 100644 test/javascript/tests-cluster/without-quorum/attachments_delete.js
create mode 100644 test/javascript/tests-cluster/without-quorum/attachments_delete_overridden_quorum.js
create mode 100644 test/javascript/tests-cluster/without-quorum/attachments_overridden_quorum.js
copy test/javascript/tests-cluster/without-quorum/{db-creation.js => db_creation.js} (89%)
copy test/javascript/tests-cluster/without-quorum/{db-creation.js => db_creation_overridden_quorum.js} (64%)
copy test/javascript/tests-cluster/without-quorum/{db-creation.js => db_deletion.js} (72%)
copy test/javascript/tests-cluster/without-quorum/{db-creation.js => db_deletion_overridden_quorum.js} (65%)
copy test/javascript/tests-cluster/without-quorum/{db-creation.js => doc_bulk.js} (74%)
copy test/javascript/tests-cluster/without-quorum/{db-creation.js => doc_bulk_overridden_quorum.js} (67%)
copy test/javascript/tests-cluster/without-quorum/{db-creation.js => doc_copy.js} (72%)
copy test/javascript/tests-cluster/without-quorum/{db-creation.js => doc_copy_overridden_quorum.js} (56%)
copy test/javascript/tests-cluster/without-quorum/{db-creation.js => doc_crud.js} (65%)
rename test/javascript/tests-cluster/without-quorum/{db-creation.js => doc_crud_overridden_quorum.js} (58%)
[couchdb] 01/01: Merge branch 'master' into drop-r16
Posted by wo...@apache.org.
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(-)