summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBrad Anderson <brad@cloudant.com>2010-05-24 18:23:21 -0400
committerBrad Anderson <brad@cloudant.com>2010-05-24 18:23:21 -0400
commit0bcc808ce4787da27bda33dff3c8e377094b7042 (patch)
tree512257a0226ffc4126ffb547011cb8d0f36a1d7b /src
parent897425141596a17231010bd1fc812c7245eb2355 (diff)
http admin call for join 'replace'
Diffstat (limited to 'src')
-rw-r--r--src/mem3.erl9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/mem3.erl b/src/mem3.erl
index 7d60ecd5..a834010a 100644
--- a/src/mem3.erl
+++ b/src/mem3.erl
@@ -85,9 +85,10 @@ stop(Server) ->
gen_server:cast(Server, stop).
--spec join(join_type(), mem_node_list(), node() | nil) -> ok.
-join(JoinType, Nodes, PingNode) ->
- gen_server:call(?SERVER, {join, JoinType, Nodes, PingNode}).
+-spec join(join_type(), mem_node_list() | {node(), options()}, node() | nil) ->
+ ok.
+join(JoinType, Payload, PingNode) ->
+ gen_server:call(?SERVER, {join, JoinType, Payload, PingNode}).
-spec clock() -> vector_clock().
@@ -153,8 +154,6 @@ init(Args) ->
%% new node(s) joining to this node
handle_call({join, JoinType, ExtNodes, PingNode}, _From, State) ->
- % {ok, NewState} = handle_join(JoinType, ExtNodes, PingNode, State),
- % {reply, ok, NewState};
try
case handle_join(JoinType, ExtNodes, PingNode, State) of
{ok, NewState} -> {reply, ok, NewState};