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:30 UTC

[couchdb] branch fix/1101/mango-conflicts updated (8d57bb3 -> 5b212a0)

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

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


    from 8d57bb3  Add `conflicts: true` option to mango selectors
     add 3358668  fix(_view changes feed): fix function_clause crash in couch_native_process. Crash was caused by a missing implementation of ddoc function for <<"views">> FunPath, implementation is based on FilterFun but matches return values of the erlang:put()  which is called in the native Emit function and also expects ok and false when docs were not emitted.
     add 0377e53  tests(couch_changes): add tests for changes feed filtering using an Erlang view
     add d36149e  Merge pull request #1401 from Spotme/spotme/fix/couch-native-process
     add 5bbfbeb  Don't set context for compaction files during db delete (#1419)
     add 73f1565  remove mention of os daemons and externals in ini files
     new 5b212a0  Merge branch 'master' into fix/1101/mango-conflicts

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 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(-)

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

Posted by ja...@apache.org.
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(-)