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 2017/09/27 21:57:30 UTC
[couchdb] 01/01: Merge branch 'master' into
make-mango-python3-compile
This is an automated email from the ASF dual-hosted git repository.
wohali pushed a commit to branch make-mango-python3-compile
in repository https://gitbox.apache.org/repos/asf/couchdb.git
commit a0ac905b638e0f1a0f328b39acb09c4a3bf212eb
Merge: 39f6f6a c07f3f5
Author: Joan Touzet <wo...@users.noreply.github.com>
AuthorDate: Wed Sep 27 17:57:27 2017 -0400
Merge branch 'master' into make-mango-python3-compile
rel/overlay/etc/default.ini | 6 +-
src/chttpd/src/chttpd_db.erl | 21 +-
src/chttpd/src/chttpd_external.erl | 22 +-
src/chttpd/src/chttpd_show.erl | 3 +-
src/couch/include/couch_db.hrl | 34 +--
src/couch/src/couch_att.erl | 3 +
src/couch/src/couch_auth_cache.erl | 14 +-
src/couch/src/couch_changes.erl | 56 ++--
src/couch/src/couch_compaction_daemon.erl | 4 +-
src/couch/src/couch_compress.erl | 14 +
src/couch/src/couch_db.erl | 307 +++++++++++++++++++--
src/couch/src/couch_db_int.hrl | 93 +++++++
src/couch/src/couch_db_plugin.erl | 6 +-
src/couch/src/couch_db_updater.erl | 10 +-
src/couch/src/couch_httpd_db.erl | 12 +-
src/couch/src/couch_lru.erl | 9 +-
src/couch/src/couch_server.erl | 135 ++++-----
.../src/couch_server_int.hrl} | 21 +-
src/couch/src/couch_users_db.erl | 8 +-
src/couch/src/couch_util.erl | 15 +-
src/couch/src/test_util.erl | 14 +
src/couch/test/couch_auth_cache_tests.erl | 2 +-
src/couch/test/couch_changes_tests.erl | 2 +-
src/couch/test/couch_compress_tests.erl | 11 +
src/couch/test/couch_db_plugin_tests.erl | 13 +-
src/couch/test/couch_server_tests.erl | 11 +-
src/couch/test/couchdb_compaction_daemon_tests.erl | 4 +-
src/couch/test/couchdb_file_compression_tests.erl | 2 +-
src/couch/test/couchdb_views_tests.erl | 25 +-
src/couch_index/src/couch_index_server.erl | 15 +-
src/couch_index/src/couch_index_util.erl | 2 +-
.../test/couch_index_compaction_tests.erl | 3 +-
.../test/couch_index_ddoc_updated_tests.erl | 2 +-
src/couch_mrview/src/couch_mrview.erl | 18 +-
src/couch_mrview/src/couch_mrview_compactor.erl | 3 +-
src/couch_mrview/src/couch_mrview_http.erl | 10 +-
src/couch_mrview/src/couch_mrview_show.erl | 16 +-
.../test/couch_mrview_all_docs_tests.erl | 2 +-
.../test/couch_mrview_changes_since_tests.erl | 2 +-
.../test/couch_mrview_collation_tests.erl | 2 +-
.../test/couch_mrview_compact_tests.erl | 2 +-
.../test/couch_mrview_ddoc_updated_tests.erl | 2 +-
.../test/couch_mrview_ddoc_validation_tests.erl | 2 +-
.../test/couch_mrview_index_changes_tests.erl | 2 +-
.../test/couch_mrview_index_info_tests.erl | 2 +-
.../test/couch_mrview_local_docs_tests.erl | 2 +-
.../test/couch_mrview_map_views_tests.erl | 2 +-
.../test/couch_mrview_red_views_tests.erl | 2 +-
.../src/couch_replicator_api_wrap.erl | 27 +-
.../src/couch_replicator_api_wrap.hrl | 2 +-
.../src/couch_replicator_clustering.erl | 116 +++-----
src/couch_replicator/src/couch_replicator_docs.erl | 19 +-
.../src/couch_replicator_scheduler_job.erl | 33 ++-
.../src/couch_replicator_utils.erl | 37 ++-
.../src/couch_replicator_worker.erl | 56 ++--
.../test/couch_replicator_compact_tests.erl | 27 +-
src/couch_stats/src/couch_stats.app.src | 4 +-
src/couch_stats/src/couch_stats.erl | 6 +-
.../src/{couch_stats.app.src => couch_stats.hrl} | 12 +-
src/couch_stats/src/couch_stats_aggregator.erl | 11 +-
src/fabric/include/couch_db_tmp.hrl | 296 --------------------
src/fabric/src/fabric.erl | 12 +-
src/fabric/src/fabric_db_info.erl | 48 +++-
src/fabric/src/fabric_rpc.erl | 123 ++-------
src/fabric/src/fabric_util.erl | 3 +-
src/mango/src/mango_crud.erl | 2 +-
src/mango/src/mango_cursor_text.erl | 4 +-
src/mango/src/mango_httpd.erl | 3 +-
src/mango/src/mango_idx.erl | 6 +-
src/mango/src/mango_idx_text.erl | 9 +-
src/mem3/src/mem3.erl | 17 +-
src/mem3/src/mem3_cluster.erl | 161 +++++++++++
src/mem3/src/mem3_httpd.erl | 4 +-
src/mem3/src/mem3_nodes.erl | 10 +-
src/mem3/src/mem3_rep.erl | 15 +-
src/mem3/src/mem3_rpc.erl | 4 +-
src/mem3/src/mem3_shards.erl | 10 +-
src/mem3/test/mem3_cluster_test.erl | 133 +++++++++
src/rexi/src/rexi_server_mon.erl | 84 ++++--
79 files changed, 1339 insertions(+), 923 deletions(-)
--
To stop receiving notification emails like this one, please contact
"commits@couchdb.apache.org" <co...@couchdb.apache.org>.