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

wohali pushed a commit to branch 1278-add-clustered-db-info
in repository https://gitbox.apache.org/repos/asf/couchdb.git

commit 8c306105f3da6391fdb116767e378a567a43cf2e
Merge: cb87b47 99e801e
Author: Joan Touzet <[email protected]>
AuthorDate: Mon Aug 6 12:31:45 2018 -0400

    Merge branch 'master' into 1278-add-clustered-db-info

 .gitignore                                         |   1 -
 .travis.yml                                        |   2 +-
 INSTALL.Unix.md                                    |   3 +
 LICENSE                                            | 117 ---------------
 Makefile                                           |  49 ++++--
 Makefile.win                                       |  45 +++++-
 NOTICE                                             |   7 -
 build-aux/couchdb-build-release.sh                 |   6 +-
 configure                                          |   9 ++
 rebar.config.script                                |  13 +-
 rel/overlay/etc/default.ini                        |  24 +--
 rel/overlay/etc/local.ini                          |   2 +-
 rel/reltool.config                                 |   2 -
 src/chttpd/src/chttpd.erl                          |   2 +-
 src/chttpd/src/chttpd_auth_request.erl             |   5 +-
 src/chttpd/src/chttpd_misc.erl                     |   1 +
 src/chttpd/test/chttpd_welcome_test.erl            |   2 +
 src/couch/rebar.config.script                      |  17 ++-
 src/couch/src/couch.app.src                        |   1 -
 src/couch/src/couch.erl                            |   1 -
 src/couch/src/couch_auth_cache.erl                 |   7 -
 src/couch/src/couch_bt_engine.erl                  |   2 +-
 src/couch/src/couch_db.erl                         |   2 +-
 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_native_process.erl             |   4 +-
 src/couch/src/couch_passwords.erl                  |  19 +--
 src/couch/src/couch_query_servers.erl              |  54 ++++++-
 src/couch/src/couch_server.erl                     |   3 +-
 src/couch/src/couch_stream.erl                     |  18 +--
 src/couch/src/couch_users_db.erl                   |  10 +-
 src/couch/src/test_engine_util.erl                 |   8 +-
 src/couch/src/test_request.erl                     |   6 +-
 src/couch/src/test_util.erl                        |   3 +
 src/couch/test/couch_passwords_tests.erl           |  42 +-----
 src/couch/test/couchdb_attachments_tests.erl       |   6 +-
 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_mrview/src/couch_mrview.erl              |   2 +-
 src/couch_mrview/src/couch_mrview_util.erl         |   8 +-
 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/fabric/src/fabric.erl                          |   9 +-
 src/mem3/src/mem3_rep.erl                          |   6 +-
 src/setup/src/setup.erl                            |  43 ++++--
 test/javascript/tests/design_docs.js               |   8 +-
 test/javascript/tests/users_db_security.js         | 167 ++-------------------
 54 files changed, 351 insertions(+), 565 deletions(-)


Reply via email to