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/08 13:52:31 UTC

[couchdb] 01/01: Merge branch 'master' into fix/1101/mango-conflicts

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

jan pushed a commit to branch fix/1101/mango-conflicts
in repository https://gitbox.apache.org/repos/asf/couchdb.git

commit 5b212a07b0ba3a635cfa213f4601522e2ef3c4c1
Merge: 8d57bb3 73f1565
Author: Jan Lehnardt <ja...@apache.org>
AuthorDate: Sun Jul 8 15:52:28 2018 +0200

    Merge branch 'master' into fix/1101/mango-conflicts

 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(-)