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 2018/07/13 19:41:57 UTC

[couchdb] 01/01: Merge branch 'master' into jenkins-ditch-16b03

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

wohali pushed a commit to branch jenkins-ditch-16b03
in repository https://gitbox.apache.org/repos/asf/couchdb.git

commit 7f515900624048102dadd7b6b1a52c0d47874e23
Merge: 48621c5 aa73e4e
Author: Joan Touzet <wo...@users.noreply.github.com>
AuthorDate: Fri Jul 13 15:41:53 2018 -0400

    Merge branch 'master' into jenkins-ditch-16b03

 rel/overlay/etc/default.ini                     | 5 +++++
 src/chttpd/src/chttpd_auth.erl                  | 4 ++++
 src/couch_mrview/src/couch_mrview_compactor.erl | 2 ++
 3 files changed, 11 insertions(+)