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

jan pushed a commit to branch fix-make-dist
in repository https://gitbox.apache.org/repos/asf/couchdb.git

commit e5668051012cd98f14fd932681d63fa366911e7f
Merge: 3f68e69 3b53c1c
Author: Jan Lehnardt <j...@apache.org>
AuthorDate: Tue Feb 13 11:58:08 2018 +0100

    Merge branch 'master' into fix-make-dist

 COMMITTERS.md                                      |   2 +-
 Jenkinsfile                                        |  27 +--
 LICENSE                                            |  26 ---
 Makefile                                           |  60 ++++--
 Makefile.win                                       |  18 --
 NOTICE                                             |   4 -
 README-DEV.rst                                     |  28 +--
 TODO                                               |  10 -
 dev/run                                            |  24 ++-
 license.skip                                       |  12 --
 rel/haproxy.cfg                                    |   4 +-
 rel/overlay/bin/couchdb                            |   8 +-
 rel/overlay/etc/default.ini                        |  19 +-
 rel/overlay/etc/local.ini                          |   3 +
 rel/plugins/eunit_plugin.erl                       |  20 ++
 src/{couch_epi => chttpd}/rebar.config             |   1 -
 src/chttpd/src/chttpd_auth_request.erl             |   4 +
 src/chttpd/src/chttpd_db.erl                       |   3 +-
 src/chttpd/src/chttpd_httpd_handlers.erl           |   1 +
 src/chttpd/src/chttpd_misc.erl                     |  35 ++++
 src/chttpd/test/chttpd_db_test.erl                 |  57 +++++-
 src/chttpd/test/chttpd_dbs_info_test.erl           | 169 ++++++++++++++++
 src/chttpd/test/chttpd_security_tests.erl          |  22 ++
 src/couch/include/couch_eunit.hrl                  |  11 +-
 src/couch/src/couch_db.erl                         |  31 ++-
 src/couch/src/couch_httpd_db.erl                   |   3 +-
 src/couch/src/couch_key_tree.erl                   |   4 -
 src/couch/src/couch_passwords.erl                  |  20 +-
 src/couch/src/test_request.erl                     |  10 +
 src/couch/test/chttpd_endpoints_tests.erl          |   1 +
 src/couch/test/couch_db_tests.erl                  | 221 +++++++++++---------
 src/couch/test/couch_key_tree_tests.erl            |  18 +-
 src/couch/test/couchdb_cookie_domain_tests.erl     |  78 ++++---
 src/couch/test/global_changes_tests.erl            |   2 +-
 src/couch_epi/rebar.config                         |   4 +
 src/couch_epi/src/couch_epi_codegen.erl            |  19 +-
 src/{couch_epi => couch_index}/rebar.config        |   1 -
 .../test/couch_index_compaction_tests.erl          |  16 +-
 .../test/couch_index_ddoc_updated_tests.erl        |   5 +-
 src/couch_log/src/couch_log.erl                    |   1 +
 src/couch_log/test/couch_log_test_util.erl         |   7 +-
 src/{couch_epi => couch_mrview}/rebar.config       |   1 -
 src/couch_mrview/src/couch_mrview_util.erl         |   4 +-
 src/couch_peruser/src/couch_peruser.erl            |  60 ++++--
 src/couch_peruser/test/couch_peruser_test.erl      | 189 ++++++++++++++---
 src/couch_replicator/README.md                     |   2 +-
 .../src/couch_replicator_api_wrap.erl              |  23 ++-
 .../src/couch_replicator_clustering.erl            |  73 ++++++-
 src/couch_replicator/src/couch_replicator_docs.erl |  37 +++-
 .../src/couch_replicator_httpd.erl                 |   2 +
 .../src/couch_replicator_scheduler_job.erl         |   3 +-
 ...replicator_create_target_with_options_tests.erl | 143 +++++++++++++
 src/couch_stats/src/couch_stats.app.src            |   2 +-
 src/couch_stats/src/couch_stats.erl                |   2 +-
 .../src/couch_stats_process_tracker.erl            |   8 +-
 src/fabric/rebar.config                            |   5 +-
 src/fabric/src/fabric_db_create.erl                |   4 +-
 src/fabric/src/fabric_view_all_docs.erl            |  10 +-
 src/mango/src/mango_cursor.erl                     |  76 +++++--
 src/mango/src/mango_cursor_special.erl             |   7 +-
 src/mango/src/mango_cursor_text.erl                |   2 +-
 src/mango/src/mango_cursor_view.erl                |   4 +-
 src/mango/src/mango_error.erl                      |  19 --
 src/mango/src/mango_idx.erl                        |  14 +-
 src/mango/src/mango_idx_text.erl                   |   3 +
 src/mango/src/mango_native_proc.erl                |  51 +++--
 src/mango/src/mango_selector.erl                   | 225 +++++++++++++++++++--
 src/mango/test/02-basic-find-test.py               |  12 ++
 src/mango/test/03-operator-test.py                 |   9 +-
 src/mango/test/05-index-selection-test.py          | 115 +++++++++--
 src/mango/test/06-basic-text-test.py               |  33 +--
 src/mango/test/07-text-custom-field-list-test.py   |  50 +++++
 .../test/10-disable-array-length-field-test.py     |   2 +-
 src/mango/test/16-index-selectors-test.py          |  12 +-
 src/mango/test/mango.py                            |  47 ++++-
 src/{couch_epi => rexi}/rebar.config               |   1 -
 test/build/test-run-couch-for-mango.sh             |   3 +
 test/javascript/run                                |  16 +-
 .../tests-cluster/with-quorum/db-creation.js       |  27 +++
 .../tests-cluster/without-quorum/db-creation.js    |  28 +++
 test/javascript/tests/design_docs_query.js         | 154 ++++++++++++++
 test/javascript/tests/view_errors.js               |   2 +-
 82 files changed, 1939 insertions(+), 550 deletions(-)


-- 
To stop receiving notification emails like this one, please contact
j...@apache.org.

Reply via email to