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 2017/10/10 21:22:41 UTC
[couchdb] 01/01: Merge branch 'master' into janl-patch-1
This is an automated email from the ASF dual-hosted git repository.
wohali pushed a commit to branch janl-patch-1
in repository https://gitbox.apache.org/repos/asf/couchdb.git
commit 3617ba15d96404c6bfd2c9d810484e588000c0c5
Merge: 6403e4a a0e0885
Author: Joan Touzet <wo...@users.noreply.github.com>
AuthorDate: Tue Oct 10 17:22:39 2017 -0400
Merge branch 'master' into janl-patch-1
src/couch/src/couch_query_servers.erl | 29 ++++++++++++++++++++++++-----
src/couch_mrview/src/couch_mrview_http.erl | 6 +++++-
src/fabric/src/fabric_util.erl | 2 --
src/fabric/src/fabric_view.erl | 2 ++
test/javascript/tests/view_errors.js | 4 ++--
5 files changed, 33 insertions(+), 10 deletions(-)
--
To stop receiving notification emails like this one, please contact
"commits@couchdb.apache.org" <co...@couchdb.apache.org>.