You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by wo...@apache.org on 2017/10/31 23:12:10 UTC

[couchdb] branch janl-patch-1 updated (0f5d703 -> 5f53d3a)

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

wohali pushed a change to branch janl-patch-1
in repository https://gitbox.apache.org/repos/asf/couchdb.git.


    from 0f5d703  re-add query
     add 0ce05d2  Update jiffy to use dedupe_keys
     add 40b9f85  Configurable delay before retrying on missing_doc error
     add 01b56d3  Revert "faet: reject user docs with duplicate keys"
     new 5f53d3a  Merge branch 'master' into janl-patch-1

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:
 rebar.config.script                                |  2 +-
 rel/overlay/etc/default.ini                        |  9 ++++
 src/chttpd/src/chttpd_auth_cache.erl               | 52 +++++-----------------
 src/couch/src/couch_users_db.erl                   | 22 ---------
 src/couch/src/couch_util.erl                       |  2 +-
 .../src/couch_replicator_worker.erl                |  7 +++
 6 files changed, 28 insertions(+), 66 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
['"commits@couchdb.apache.org" <co...@couchdb.apache.org>'].

[couchdb] 01/01: Merge branch 'master' into janl-patch-1

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

wohali pushed a commit to branch janl-patch-1
in repository https://gitbox.apache.org/repos/asf/couchdb.git

commit 5f53d3a85c4b5625618980dddd99e2e3beb14ca7
Merge: 0f5d703 01b56d3
Author: Joan Touzet <wo...@users.noreply.github.com>
AuthorDate: Tue Oct 31 19:12:09 2017 -0400

    Merge branch 'master' into janl-patch-1

 rebar.config.script                                |  2 +-
 rel/overlay/etc/default.ini                        |  9 ++++
 src/chttpd/src/chttpd_auth_cache.erl               | 52 +++++-----------------
 src/couch/src/couch_users_db.erl                   | 22 ---------
 src/couch/src/couch_util.erl                       |  2 +-
 .../src/couch_replicator_worker.erl                |  7 +++
 6 files changed, 28 insertions(+), 66 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
"commits@couchdb.apache.org" <co...@couchdb.apache.org>.