You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by kx...@apache.org on 2015/10/15 18:38:51 UTC
[1/2] couch-replicator commit: updated refs/heads/master to 36e5bec
Repository: couchdb-couch-replicator
Updated Branches:
refs/heads/master 85d62d1e2 -> 36e5beccd
Use couch_httpd_multipart:abort_multipart_stream
abort_multi_part_stream has been moved and renamed into
couch_httpd_mutlipart:abort_multipart_stream
Project: http://git-wip-us.apache.org/repos/asf/couchdb-couch-replicator/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-couch-replicator/commit/b88601bf
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-couch-replicator/tree/b88601bf
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-couch-replicator/diff/b88601bf
Branch: refs/heads/master
Commit: b88601bf974b9537d8fc0e94e86cc072d9a5f449
Parents: c9184cf
Author: ILYA Khlopotov <ii...@ca.ibm.com>
Authored: Fri Nov 28 11:46:50 2014 -0800
Committer: ILYA Khlopotov <ii...@ca.ibm.com>
Committed: Wed Jan 7 11:11:43 2015 -0800
----------------------------------------------------------------------
src/couch_replicator_api_wrap.erl | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-couch-replicator/blob/b88601bf/src/couch_replicator_api_wrap.erl
----------------------------------------------------------------------
diff --git a/src/couch_replicator_api_wrap.erl b/src/couch_replicator_api_wrap.erl
index c35659d..b8644da 100644
--- a/src/couch_replicator_api_wrap.erl
+++ b/src/couch_replicator_api_wrap.erl
@@ -674,7 +674,7 @@ receive_docs(Streamer, UserFun, Ref, UserAcc) ->
{ok, UserAcc2} ->
ok;
{skip, UserAcc2} ->
- couch_doc:abort_multi_part_stream(Parser)
+ couch_httpd_multipart:abort_multi_part_stream(Parser)
end,
WaitFun(),
receive_docs(Streamer, UserFun, Ref, UserAcc2)
[2/2] couch-replicator commit: updated refs/heads/master to 36e5bec
Posted by kx...@apache.org.
Merge remote-tracking branch 'github/pr/4'
Project: http://git-wip-us.apache.org/repos/asf/couchdb-couch-replicator/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-couch-replicator/commit/36e5becc
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-couch-replicator/tree/36e5becc
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-couch-replicator/diff/36e5becc
Branch: refs/heads/master
Commit: 36e5beccd661158260c3985ae0b5f439022ab15b
Parents: 85d62d1 b88601b
Author: Alexander Shorin <kx...@apache.org>
Authored: Thu Oct 15 19:37:26 2015 +0300
Committer: Alexander Shorin <kx...@apache.org>
Committed: Thu Oct 15 19:37:26 2015 +0300
----------------------------------------------------------------------
src/couch_replicator_api_wrap.erl | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-couch-replicator/blob/36e5becc/src/couch_replicator_api_wrap.erl
----------------------------------------------------------------------