You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by to...@apache.org on 2018/06/19 05:50:24 UTC
[couchdb] 01/01: Merge branch 'master' into
retain_user_ctx_after_auth
This is an automated email from the ASF dual-hosted git repository.
tonysun83 pushed a commit to branch retain_user_ctx_after_auth
in repository https://gitbox.apache.org/repos/asf/couchdb.git
commit 1068fe0e7e3822f637fcfded6e925ede44ea298d
Merge: 475f1d6 3c98385
Author: Tony Sun <to...@gmail.com>
AuthorDate: Mon Jun 18 22:50:20 2018 -0700
Merge branch 'master' into retain_user_ctx_after_auth
Jenkinsfile | 4 +-
Makefile | 13 +--
rebar.config.script | 7 +-
src/couch/src/couch_db.erl | 10 +--
src/couch/src/couch_db_updater.erl | 33 ++++----
src/couch/src/couch_key_tree.erl | 74 +++++++++++++++++
src/couch/src/couch_query_servers.erl | 31 +++----
src/couch/test/couch_key_tree_tests.erl | 24 ++++--
src/couch_mrview/src/couch_mrview.erl | 28 +++++--
src/couch_mrview/src/couch_mrview_index.erl | 3 +-
src/couch_mrview/src/couch_mrview_util.erl | 17 ++++
.../test/couch_mrview_index_info_tests.erl | 96 ++++++++++++++++------
src/fabric/src/fabric_rpc.erl | 5 +-
src/fabric/src/fabric_view.erl | 2 +-
14 files changed, 264 insertions(+), 83 deletions(-)