BZ 977: fix typo in use of riak_object:syntactic_merge(): call /4 *no…

…t* /3.
basho · May 4, 2011 · 9078b18 · 9078b18
1 parent 97cc02b
commit 9078b18
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/riak_kv_vnode.erl b/src/riak_kv_vnode.erl
@@ -371,7 +371,7 @@ syntactic_put_merge(Mod, ModState, BKey, Obj1, ReqId, StartTime) ->
         {ok, Val0} ->
             Obj0 = binary_to_term(Val0),
             ResObj = riak_object:syntactic_merge(
-                       Obj0,Obj1,term_to_binary(ReqId)), StartTime,
+                       Obj0,Obj1,term_to_binary(ReqId),StartTime),
             case riak_object:vclock(ResObj) =:= riak_object:vclock(Obj0) of
                 true -> {oldobj, ResObj};
                 false -> {newobj, ResObj}