This is an automated email from the ASF dual-hosted git repository. eiri pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/couchdb.git
commit f350d5f5de8413ffaa6c5fac6bfb19f090fbd8ec Merge: 3e3eba0 6ee3d95 Author: Eric Avdey <[email protected]> AuthorDate: Mon Oct 29 12:04:09 2018 -0300 Merge pull request #1683 from cloudant/fix-_local-_bulk_docs Fixes for _local doc update and _bulk_docs operations with new_edits false src/chttpd/src/chttpd_db.erl | 21 ++-- src/couch/src/couch_db.erl | 126 +++++++++++----------- src/couch/src/couch_db_updater.erl | 108 +++++++++++++++---- src/couch/test/couchdb_update_conflicts_tests.erl | 64 +++++++++-- 4 files changed, 212 insertions(+), 107 deletions(-)
