You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by mi...@apache.org on 2015/06/05 18:43:07 UTC

[11/11] couch-replicator commit: updated refs/heads/2707-merge-couch_replicator-fixes-from-cloudant-fork to 80708a9

Infinity timeout, just like all the others :(

This is a cherry-pick of:

https://github.com/cloudant/couch_replicator/commit/e947b392db1eb2de22aac4a4fa12da118fe114b3


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/80708a99
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-couch-replicator/tree/80708a99
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-couch-replicator/diff/80708a99

Branch: refs/heads/2707-merge-couch_replicator-fixes-from-cloudant-fork
Commit: 80708a99e2bc82868c26de89b7a4d86c0c4167af
Parents: 9d010db
Author: Robert Newson <rn...@apache.org>
Authored: Tue May 26 16:04:24 2015 +0100
Committer: Mike Wallace <mi...@apache.org>
Committed: Fri Jun 5 17:20:26 2015 +0100

----------------------------------------------------------------------
 src/couch_replicator_manager.erl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb-couch-replicator/blob/80708a99/src/couch_replicator_manager.erl
----------------------------------------------------------------------
diff --git a/src/couch_replicator_manager.erl b/src/couch_replicator_manager.erl
index b74ba41..972d8ed 100644
--- a/src/couch_replicator_manager.erl
+++ b/src/couch_replicator_manager.erl
@@ -134,7 +134,7 @@ replication_error(#rep{id = {BaseId, _} = RepId}, Error) ->
 continue(#rep{doc_id = null}) ->
     {true, no_owner};
 continue(#rep{id = RepId}) ->
-    Owner = gen_server:call(?MODULE, {owner, RepId}),
+    Owner = gen_server:call(?MODULE, {owner, RepId}, infinity),
     {node() == Owner, Owner}.