You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@couchdb.apache.org by ja...@apache.org on 2018/07/14 10:37:52 UTC

[couchdb] 01/01: Merge branch 'master' into feat/admin-only-all-dbs

This is an automated email from the ASF dual-hosted git repository.

jan pushed a commit to branch feat/admin-only-all-dbs
in repository https://gitbox.apache.org/repos/asf/couchdb.git

commit b8a6cf793cff243372e098ee5ecb89d9d76c5809
Merge: 6fc9cdd fa3c812
Author: Jan Lehnardt <ja...@apache.org>
AuthorDate: Sat Jul 14 12:37:49 2018 +0200

    Merge branch 'master' into feat/admin-only-all-dbs

 Makefile                                    | 10 +++++---
 rebar.config.script                         |  4 +--
 src/chttpd/src/chttpd_misc.erl              | 10 +++++---
 src/couch/src/couch_httpd_misc_handlers.erl |  2 +-
 src/couch/src/couch_util.erl                | 40 +++++++++++++++++++++++++----
 5 files changed, 52 insertions(+), 14 deletions(-)