This is an automated email from the ASF dual-hosted git repository.
jan pushed a change to branch fix/prox
in repository https://gitbox.apache.org/repos/asf/couchdb.git.
from 160b8fd hook up proxy auth handler to chttpd
add 45a0ad9 Add `conflicts: true` option to mango selectors
add 572234f Add tests for mango conflict finding
new 073297b Merge branch 'master' into fix/prox
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:
src/mango/src/mango_cursor_view.erl | 8 ++++----
src/mango/test/19-find-conflicts.py | 41 +++++++++++++++++++++++++++++++++++++
src/mango/test/mango.py | 5 +++++
3 files changed, 50 insertions(+), 4 deletions(-)
create mode 100644 src/mango/test/19-find-conflicts.py
