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/13 15:18:47 UTC

[couchdb] branch fix/prox updated (160b8fd -> 073297b)

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


[couchdb] 01/01: Merge branch 'master' into fix/prox

Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit 073297bc9974e8462b2a30064da34cf46c99006c
Merge: 160b8fd 572234f
Author: Jan Lehnardt <ja...@apache.org>
AuthorDate: Fri Jul 13 17:18:45 2018 +0200

    Merge branch 'master' into fix/prox

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