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:05:34 UTC

[couchdb] 01/01: Merge branch 'master' into feat/show-git-hash-in-info

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

jan pushed a commit to branch feat/show-git-hash-in-info
in repository https://gitbox.apache.org/repos/asf/couchdb.git

commit e1bb5e84d7532399ba02a691ea32226c1f4e21b1
Merge: c8b0b0a 572234f
Author: Jan Lehnardt <ja...@apache.org>
AuthorDate: Fri Jul 13 17:05:31 2018 +0200

    Merge branch 'master' into feat/show-git-hash-in-info

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