This is an automated email from the ASF dual-hosted git repository. jan pushed a commit to branch fix/2.1.2-sec in repository https://gitbox.apache.org/repos/asf/couchdb.git
commit 5a97f838d53b2bb8df38d372204b49cf058c0ebe Merge: a1b3d63 0f130cb Author: Jan Lehnardt <[email protected]> AuthorDate: Sat Jul 14 12:06:05 2018 +0200 Merge branch 'master' into fix/2.1.2-sec .travis.yml | 1 - Jenkinsfile | 4 ++-- rebar.config.script | 2 +- rel/overlay/etc/default.ini | 5 +++++ src/chttpd/src/chttpd_auth.erl | 4 ++++ src/couch_mrview/src/couch_mrview_compactor.erl | 2 ++ 6 files changed, 14 insertions(+), 4 deletions(-)
