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

davisp pushed a change to branch ensure-view-build-progress
in repository https://gitbox.apache.org/repos/asf/couchdb.git.


 discard ab5d87e  Minimize conflicts while building views
 discard 82ff3e0  Allow specifying an end_key for fold_changes
    omit 7aa1806  Allow snapshots through fabric2_fdb:transactional
     add 1be2312  Use `req_body` field if present
     add 5cfa4a8  Merge pull request #3268 from cloudant/reuse-json-body
     add 8c21567  Bump erlfdb to v1.2.3
     add 3844f93  Allow snapshots through fabric2_fdb:transactional
     add b04cdc4  Allow specifying an end_key for fold_changes
     add feb66d5  Minimize conflicts while building views
     add 7995675  Remove unnecessary line wraps

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (ab5d87e)
            \
             N -- N -- N   refs/heads/ensure-view-build-progress (7995675)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

No new revisions were added by this update.

Summary of changes:
 rebar.config.script                         |  2 +-
 src/couch/src/couch_httpd.erl               |  7 ++++--
 src/couch_views/src/couch_views_indexer.erl | 38 +++++++++++++++++++++--------
 3 files changed, 34 insertions(+), 13 deletions(-)

Reply via email to