[couchdb] branch fix-ebtree-umerge-members updated (e0d31f0 -> e453763)

[da...@apache.org]

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

davisp pushed a change to branch fix-ebtree-umerge-members
in repository https://gitbox.apache.org/repos/asf/couchdb.git.


 discard e0d31f0  Fix bug in ebtree:umerge_members/4
     add 41e75e6  Add url validation in replicator creds stripping logic
     add ffb85f1  Fix flaky couch_replicator_job_server tests
     add e453763  Fix bug in ebtree:umerge_members/4

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   (e0d31f0)
            \
             N -- N -- N   refs/heads/fix-ebtree-umerge-members (e453763)

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:
 src/couch_replicator/src/couch_replicator.erl      | 104 ++++++++++++---------
 .../eunit/couch_replicator_job_server_tests.erl    |  24 +++--
 2 files changed, 76 insertions(+), 52 deletions(-)