Permalink
Browse files

merging

  • Loading branch information...
2 parents 3a52fa7 + 412dce7 commit f598391d84768571b53997c02cdbdbe551b36c3d Jacob Vorreuter committed Oct 17, 2009
Showing with 4 additions and 0 deletions.
  1. +4 −0 src/mcerlang.erl
View
@@ -214,7 +214,11 @@ start_connection(Host, Port) ->
%%% Internal functions
%%--------------------------------------------------------------------
add_server_to_continuum(Host, Port) ->
+<<<<<<< HEAD:src/mcerlang.erl
[ets:insert(mcerlang_continuum, {hash_to_uint(Host, Port), {Host, Port}}) || _ <- lists:seq(1, 100)].
+=======
+ ets:insert(mcerlang_continuum, {hash_to_uint(Host, Port), {Host, Port}}).
+>>>>>>> 412dce704d1ad98037abdb2adabd55b95ed88e32:src/mcerlang.erl
remove_server_from_continuum(Host, Port) ->
ets:delete(mcerlang_continuum, hash_to_uint(Host, Port)).

0 comments on commit f598391

Please sign in to comment.