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

jiangphcn pushed a change to branch sm52
in repository https://gitbox.apache.org/repos/asf/couchdb.git.


 discard aac05cb  upgrade SM to 60
 discard 872efe6  wip: port to spidermonkey 52
     add fc6cc98  Remove old clause which is no longer used
     add b99d6e0  Merge pull request #2276 from 
cloudant/remove-inets-client-remains
     add 053d494  Implement separate source and target replication proxies
     add 692f602  Include proxy host and port in connection pool key
     add 30d4e95  Pass timeout as an error to callback in fabric_view_all_docs
     add 5e3e50f  Merge pull request #2287 from 
apache/fix-all_docs-timeout-error
     add edffd78  wip: port to spidermonkey 52
     add 6fc69e5  upgrade SM to 60

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   (aac05cb)
            \
             N -- N -- N   refs/heads/sm52 (6fc69e5)

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:
 .travis.yml                                        |  1 +
 src/chttpd/src/chttpd.erl                          |  3 --
 src/couch/src/couch_httpd.erl                      |  3 --
 .../src/couch_replicator_connection.erl            | 58 ++++++++++++++++------
 src/couch_replicator/src/couch_replicator_docs.erl | 25 ++++++++--
 .../src/couch_replicator_httpc.erl                 |  8 +--
 .../src/couch_replicator_httpc_pool.erl            | 17 +++++--
 .../test/eunit/couch_replicator_proxy_tests.erl    | 49 +++++++++++++++++-
 src/fabric/src/fabric_view_all_docs.erl            |  4 +-
 9 files changed, 129 insertions(+), 39 deletions(-)

Reply via email to