This is an automated email from the ASF dual-hosted git repository.
eiri pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/couchdb.git.
from 3e3eba0 Merge pull request #1681 from
apache/COUCHDB-3326-get_minimum_purge_seq
add ee20ad7 Handle an exception on an invalid rev in a local doc update
add a7ccaeb Remove extra spaces from a test module
add ca60a5e Write local docs in a correct tree on a bulk operation with
new_edits false
add 6ee3d95 Extend generation of missing id to a bulk operation with
new_edits false
new f350d5f Merge pull request #1683 from cloudant/fix-_local-_bulk_docs
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/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(-)