couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mikewall...@apache.org
Subject couch-replicator commit: updated refs/heads/2707-merge-couch_replicator-fixes-from-cloudant-fork to fbab534
Date Tue, 02 Jun 2015 17:50:57 GMT
Repository: couchdb-couch-replicator
Updated Branches:
  refs/heads/2707-merge-couch_replicator-fixes-from-cloudant-fork 367562b41 -> fbab53489


[squash] Restore second function clause for owner/2


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

Branch: refs/heads/2707-merge-couch_replicator-fixes-from-cloudant-fork
Commit: fbab53489fa6bba662cb31f8d04f438f35f388e4
Parents: 367562b
Author: Mike Wallace <mikewallace@apache.org>
Authored: Tue Jun 2 18:50:56 2015 +0100
Committer: Mike Wallace <mikewallace@apache.org>
Committed: Tue Jun 2 18:50:56 2015 +0100

----------------------------------------------------------------------
 src/couch_replicator_manager.erl | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb-couch-replicator/blob/fbab5348/src/couch_replicator_manager.erl
----------------------------------------------------------------------
diff --git a/src/couch_replicator_manager.erl b/src/couch_replicator_manager.erl
index d29c826..b136b71 100644
--- a/src/couch_replicator_manager.erl
+++ b/src/couch_replicator_manager.erl
@@ -445,7 +445,9 @@ process_update(State, DbName, {Change}) ->
 owner(<<"shards/", _/binary>> = DbName, DocId, Live) ->
     Nodes = lists:sort([N || #shard{node=N} <- mem3:shards(mem3:dbname(DbName), DocId),
 			     lists:member(N, Live)]),
-    hd(mem3_util:rotate_list({DbName, DocId}, Nodes)).
+    hd(mem3_util:rotate_list({DbName, DocId}, Nodes));
+owner(_DbName, _DocId, _Live) ->
+    node().
 
 rep_db_update_error(Error, DbName, DocId) ->
     case Error of


Mime
View raw message