You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by ja...@apache.org on 2018/07/17 09:00:54 UTC
[couchdb] 01/01: Merge branch 'master' into
feat/re-increase-max-req-size
This is an automated email from the ASF dual-hosted git repository.
jan pushed a commit to branch feat/re-increase-max-req-size
in repository https://gitbox.apache.org/repos/asf/couchdb.git
commit 37316b24b4135ce012e585f4a2ad6770683b7293
Merge: 3d761ac 6ed65e8
Author: Jan Lehnardt <ja...@apache.org>
AuthorDate: Tue Jul 17 11:00:50 2018 +0200
Merge branch 'master' into feat/re-increase-max-req-size
Makefile | 45 ++++++++++++++++++----
Makefile.win | 45 ++++++++++++++++++++--
build-aux/couchdb-build-release.sh | 6 ++-
configure | 9 +++++
src/chttpd/src/chttpd.erl | 2 +-
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_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_native_process.erl | 4 +-
src/couch/src/couch_server.erl | 3 +-
src/couch/src/couch_stream.erl | 18 ++++-----
src/couch/src/test_engine_util.erl | 8 ++--
src/couch/src/test_request.erl | 6 ++-
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 +-
.../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_ids.erl | 2 +-
.../test/couch_replicator_many_leaves_tests.erl | 2 +-
.../test/couch_replicator_test_helper.erl | 12 +++---
src/mem3/src/mem3_rep.erl | 6 +--
test/javascript/tests/design_docs.js | 8 +++-
29 files changed, 215 insertions(+), 62 deletions(-)