Merge branch 'wip-rgw-new-atomic'

diff --cc src/rgw/rgw_access.h
Simple merge

diff --cc src/rgw/rgw_op.cc
index 8434a4580fc13570dd46159596afdbf7e8f1fc01,b15cec80cbc66eba3614dfabfbb0a15e66a1dde4..74724ce2f43b9d95acf7a8dd712265172b1472ba
--- 1/src/rgw/rgw_op.cc
--- 2/src/rgw/rgw_op.cc
+++ b/src/rgw/rgw_op.cc
@@@ -841,9 -861,10 +861,10 @@@ int RGWPutObjProcessor_Multipart::compl
  
    string multipart_meta_obj = mp.get_meta();
  
-   rgw_obj meta_obj(s->bucket, multipart_meta_obj, s->object_str, mp_ns);
+   rgw_obj meta_obj;
+   meta_obj.init_ns(s->bucket, multipart_meta_obj, mp_ns);
  
 -  r = rgwstore->tmap_set(meta_obj, p, bl);
 +  r = rgwstore->omap_set(meta_obj, p, bl);
  
    return r;
  }

diff --cc src/rgw/rgw_rados.cc
Simple merge

diff --cc src/rgw/rgw_rados.h
Simple merge