couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mikewall...@apache.org
Subject [13/13] couch-replicator commit: updated refs/heads/2707-merge-couch_replicator-fixes-from-cloudant-fork to 367562b
Date Tue, 02 Jun 2015 17:29:20 GMT
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/367562b4
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-couch-replicator/tree/367562b4
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-couch-replicator/diff/367562b4

Branch: refs/heads/2707-merge-couch_replicator-fixes-from-cloudant-fork
Commit: 367562b4120a4ff0ba1a01dfa96534cf8d02d881
Parents: 9259784
Author: Robert Newson <rnewson@apache.org>
Authored: Tue May 26 16:04:24 2015 +0100
Committer: Mike Wallace <mikewallace@apache.org>
Committed: Tue Jun 2 18:23:01 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/367562b4/src/couch_replicator_manager.erl
----------------------------------------------------------------------
diff --git a/src/couch_replicator_manager.erl b/src/couch_replicator_manager.erl
index 0961889..d29c826 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}.
 
 


Mime
View raw message