From commits-return-32313-archive-asf-public=cust-asf.ponee.io@couchdb.apache.org Mon Mar 5 14:23:27 2018 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id 31C22180676 for ; Mon, 5 Mar 2018 14:23:27 +0100 (CET) Received: (qmail 50882 invoked by uid 500); 5 Mar 2018 13:23:26 -0000 Mailing-List: contact commits-help@couchdb.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@couchdb.apache.org Delivered-To: mailing list commits@couchdb.apache.org Received: (qmail 50868 invoked by uid 99); 5 Mar 2018 13:23:26 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 05 Mar 2018 13:23:26 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id A195C825D6; Mon, 5 Mar 2018 13:23:25 +0000 (UTC) Date: Mon, 05 Mar 2018 13:23:26 +0000 To: "commits@couchdb.apache.org" Subject: [couchdb] 01/01: Merge branch 'master' into test/re-enable-quote-flakey-quote-test MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit From: jan@apache.org In-Reply-To: <152025620539.22627.4735173478513256133@gitbox.apache.org> References: <152025620539.22627.4735173478513256133@gitbox.apache.org> X-Git-Host: gitbox.apache.org X-Git-Repo: couchdb X-Git-Refname: refs/heads/test/re-enable-quote-flakey-quote-test X-Git-Reftype: branch X-Git-Rev: 8803c11e84768328ebca5b820d54327f4d14e671 X-Git-NotificationType: diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated Message-Id: <20180305132325.A195C825D6@gitbox.apache.org> This is an automated email from the ASF dual-hosted git repository. jan pushed a commit to branch test/re-enable-quote-flakey-quote-test in repository https://gitbox.apache.org/repos/asf/couchdb.git commit 8803c11e84768328ebca5b820d54327f4d14e671 Merge: 7603f05 9b99722 Author: Jan Lehnardt AuthorDate: Mon Mar 5 14:23:23 2018 +0100 Merge branch 'master' into test/re-enable-quote-flakey-quote-test Jenkinsfile | 117 -- rebar.config.script | 2 +- rel/overlay/etc/default.ini | 10 + src/chttpd/src/chttpd_db.erl | 22 +- src/chttpd/test/chttpd_db_test.erl | 15 +- src/couch/.gitignore | 5 + src/couch/include/couch_db.hrl | 5 +- src/couch/src/couch_att.erl | 122 +- src/couch/src/couch_auth_cache.erl | 9 +- src/couch/src/couch_bt_engine.erl | 959 ++++++++++++++ src/couch/src/couch_bt_engine.hrl | 24 + src/couch/src/couch_bt_engine_compactor.erl | 496 ++++++++ src/couch/src/couch_bt_engine_header.erl | 434 +++++++ src/couch/src/couch_bt_engine_stream.erl | 70 ++ src/couch/src/couch_changes.erl | 21 +- src/couch/src/couch_compaction_daemon.erl | 32 +- src/couch/src/couch_db.erl | 735 +++++------ src/couch/src/couch_db_engine.erl | 893 +++++++++++++ src/couch/src/couch_db_int.hrl | 69 +- src/couch/src/couch_db_updater.erl | 1310 +++++--------------- src/couch/src/couch_file.erl | 12 +- src/couch/src/couch_httpd_db.erl | 8 +- src/couch/src/couch_httpd_misc_handlers.erl | 13 - src/couch/src/couch_httpd_multipart.erl | 77 +- src/couch/src/couch_server.erl | 236 +++- src/couch/src/couch_stream.erl | 255 ++-- src/couch/src/couch_util.erl | 47 +- src/couch/src/test_engine_attachments.erl | 93 ++ src/couch/src/test_engine_compaction.erl | 185 +++ src/couch/src/test_engine_fold_changes.erl | 190 +++ src/couch/src/test_engine_fold_docs.erl | 390 ++++++ src/couch/src/test_engine_get_set_props.erl | 70 ++ src/couch/src/test_engine_open_close_delete.erl | 81 ++ src/couch/src/test_engine_purge_docs.erl | 158 +++ src/couch/src/test_engine_read_write_docs.erl | 317 +++++ src/couch/src/test_engine_ref_counting.erl | 103 ++ src/couch/src/test_engine_util.erl | 604 +++++++++ src/couch/test/couch_bt_engine_tests.erl | 20 + src/couch/test/couch_db_plugin_tests.erl | 2 +- src/couch/test/couch_server_tests.erl | 16 + src/couch/test/couch_stream_tests.erl | 32 +- src/couch/test/couchdb_compaction_daemon_tests.erl | 2 +- src/couch/test/couchdb_views_tests.erl | 42 +- src/couch_index/src/couch_index_updater.erl | 6 +- src/couch_mrview/src/couch_mrview.erl | 32 +- src/couch_mrview/src/couch_mrview_util.erl | 15 +- .../test/couch_mrview_local_docs_tests.erl | 6 +- .../src/couch_replicator_httpc.erl | 7 +- .../test/couch_replicator_compact_tests.erl | 4 +- .../test/couch_replicator_filtered_tests.erl | 4 +- .../test/couch_replicator_missing_stubs_tests.erl | 4 +- .../test/couch_replicator_selector_tests.erl | 4 +- .../test/couch_replicator_test_helper.erl | 4 +- .../couch_replicator_use_checkpoints_tests.erl | 4 +- src/fabric/src/fabric_db_create.erl | 29 +- src/fabric/src/fabric_rpc.erl | 9 +- src/mem3/include/mem3.hrl | 6 +- src/mem3/src/mem3.erl | 19 +- src/mem3/src/mem3_nodes.erl | 3 +- src/mem3/src/mem3_rep.erl | 13 +- src/mem3/src/mem3_shards.erl | 61 +- src/mem3/src/mem3_util.erl | 17 +- src/mem3/test/mem3_util_test.erl | 16 +- 63 files changed, 6532 insertions(+), 2034 deletions(-) -- To stop receiving notification emails like this one, please contact jan@apache.org.