Merge branch 'master' into mas-iq6-rootpathundefined

test/end_to_end/testutil.erl

@@ -49,6 +49,7 @@
             foldkeysfun/3,
             foldkeysfun_returnbucket/3,
             sync_strategy/0,
+            riak_object/4,
         numbered_key/1,
         fixed_bin_key/1]).
 
@@ -62,6 +63,15 @@
 -define(EMPTY_VTAG_BIN, <<"e">>).
 -define(ROOT_PATH, "test").
 
+
+riak_object(Bucket, Key, Value, MetaData) ->
+    Content = #r_content{metadata=dict:from_list(MetaData), value=Value},
+    Obj = #r_object{bucket=Bucket,
+                    key=Key,
+                    contents=[Content],
+                    vclock=generate_vclock()},
+    to_binary(v1, Obj).
+
 %% =================================================
 %% From riak_object