This is an automated email from the ASF dual-hosted git repository. jan pushed a commit to branch feat/ssl-server-options in repository https://gitbox.apache.org/repos/asf/couchdb.git
commit 094e8d90877224dbfd570abe7a696e5383bece25 Merge: 6d55014 73f1565 Author: Jan Lehnardt <[email protected]> AuthorDate: Sun Jul 8 15:06:18 2018 +0200 Merge branch 'master' into feat/ssl-server-options rel/overlay/etc/default.ini | 24 +-------------------- rel/overlay/etc/local.ini | 14 ------------- src/couch/src/couch_bt_engine.erl | 4 ++-- src/couch/src/couch_native_process.erl | 12 +++++++++++ src/couch/src/couch_server.erl | 2 +- src/couch/test/couch_changes_tests.erl | 38 +++++++++++++++++++++++++++++++++- 6 files changed, 53 insertions(+), 41 deletions(-)
