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/08/06 14:41:54 UTC
[couchdb] 01/01: Merge branch 'master' into dns-cluster-discovery
This is an automated email from the ASF dual-hosted git repository.
wohali pushed a commit to branch dns-cluster-discovery
in repository https://gitbox.apache.org/repos/asf/couchdb.git
commit 54edac959fdeae6f64663be83bfb5b4ba8510b57
Merge: 967d1b0 0cbaefc
Author: Joan Touzet <wo...@users.noreply.github.com>
AuthorDate: Mon Aug 6 10:41:51 2018 -0400
Merge branch 'master' into dns-cluster-discovery
.gitignore | 2 +-
.travis.yml | 11 +-
INSTALL.Unix.md | 9 +-
Jenkinsfile | 153 ++++++++++----
LICENSE | 135 ++-----------
Makefile | 62 ++++--
Makefile.win | 45 ++++-
NOTICE | 9 +-
build-aux/couchdb-build-release.sh | 6 +-
configure | 9 +
rebar.config.script | 25 ++-
rel/overlay/etc/default.ini | 46 ++---
rel/overlay/etc/local.ini | 14 --
rel/reltool.config | 4 +-
src/chttpd/src/chttpd.erl | 70 ++++++-
src/chttpd/src/chttpd_auth.erl | 4 +
src/chttpd/src/chttpd_auth_request.erl | 5 +-
src/chttpd/src/chttpd_db.erl | 1 -
src/chttpd/src/chttpd_misc.erl | 11 +-
src/chttpd/test/chttpd_welcome_test.erl | 2 +
src/couch/rebar.config.script | 17 +-
src/couch/src/couch.app.src | 4 +-
src/couch/src/couch.erl | 1 -
src/couch/src/couch_auth_cache.erl | 7 -
src/couch/src/couch_bt_engine.erl | 6 +-
src/couch/src/couch_db.erl | 12 +-
src/couch/src/couch_db_updater.erl | 38 ++--
src/couch/src/couch_file.erl | 8 +-
src/couch/src/couch_hash.erl | 45 +++++
src/couch/src/couch_httpd.erl | 2 +-
src/couch/src/couch_httpd_auth.erl | 12 +-
src/couch/src/couch_httpd_misc_handlers.erl | 2 +-
src/couch/src/couch_key_tree.erl | 83 +++++++-
src/couch/src/couch_native_process.erl | 16 +-
src/couch/src/couch_passwords.erl | 19 +-
src/couch/src/couch_query_servers.erl | 80 +++++++-
src/couch/src/couch_server.erl | 7 +-
src/couch/src/couch_stream.erl | 18 +-
src/couch/src/couch_users_db.erl | 10 +-
src/couch/src/couch_util.erl | 50 ++++-
src/couch/src/test_engine_util.erl | 11 +-
src/couch/src/test_request.erl | 6 +-
src/couch/src/test_util.erl | 3 +
src/couch/test/couch_changes_tests.erl | 38 +++-
src/couch/test/couch_key_tree_tests.erl | 197 +++++++++---------
src/couch/test/couch_passwords_tests.erl | 42 +---
src/couch/test/couchdb_attachments_tests.erl | 12 +-
src/couch_epi/src/couch_epi_data.erl | 2 +-
src/couch_epi/src/couch_epi_util.erl | 2 +-
src/couch_event/src/couch_event_os_sup.erl | 82 --------
src/couch_event/src/couch_event_sup2.erl | 7 -
.../test/couch_index_ddoc_updated_tests.erl | 2 +-
src/couch_log/src/couch_log_server.erl | 1 +
src/couch_mrview/src/couch_mrview.erl | 32 ++-
src/couch_mrview/src/couch_mrview_compactor.erl | 2 +
src/couch_mrview/src/couch_mrview_index.erl | 3 +-
src/couch_mrview/src/couch_mrview_util.erl | 25 ++-
.../test/couch_mrview_index_info_tests.erl | 96 ++++++---
src/couch_replicator/src/couch_replicator_auth.erl | 2 +-
src/couch_replicator/src/couch_replicator_ids.erl | 2 +-
.../test/couch_replicator_many_leaves_tests.erl | 2 +-
.../test/couch_replicator_test_helper.erl | 12 +-
src/ddoc_cache/src/ddoc_cache_lru.erl | 1 +
src/fabric/src/fabric.erl | 9 +-
src/fabric/src/fabric_db_delete.erl | 6 +-
src/fabric/src/fabric_doc_atts.erl | 168 ++++++++++++++++
src/fabric/src/fabric_rpc.erl | 7 +-
src/fabric/src/fabric_view.erl | 3 +-
src/mango/src/mango_cursor.erl | 18 +-
src/mango/src/mango_cursor_view.erl | 8 +-
src/mango/src/mango_error.erl | 4 +-
src/mango/src/mango_idx.erl | 36 +---
src/mango/src/mango_idx_special.erl | 13 +-
src/mango/src/mango_idx_view.erl | 30 ++-
src/mango/src/mango_selector.erl | 113 ++++++++++-
src/mango/test/02-basic-find-test.py | 7 +
src/mango/test/18-json-sort.py | 222 +++++++++++++++++++++
src/mango/test/19-find-conflicts.py | 41 ++++
src/mango/test/mango.py | 5 +
src/mem3/src/mem3_rep.erl | 6 +-
src/mem3/src/mem3_shards.erl | 1 +
src/rexi/src/rexi_server.erl | 1 +
src/setup/src/setup.erl | 43 ++--
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 ++-
test/javascript/tests/design_docs.js | 8 +-
test/javascript/tests/reduce_builtin.js | 20 ++
test/javascript/tests/users_db.js | 7 +
test/javascript/tests/users_db_security.js | 167 ++--------------
116 files changed, 2140 insertions(+), 1089 deletions(-)