Merge branch 'wip-rgw-versionchecks' into next

Conflicts:
	src/rgw/rgw_rest_metadata.h

Reviewed-by: Yehuda Sadeh <yehuda@inktank.com

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

diff --cc src/rgw/rgw_bucket.cc
index 8de5a3d101fe9291692ce2c498c9e873e65fd115,439f5035dcc6ce984d8b54543ded2345c159ddba..bf8da99d616da5298c9a5be2ba9937625b69ee5c
--- 1/src/rgw/rgw_bucket.cc
--- 2/src/rgw/rgw_bucket.cc
+++ b/src/rgw/rgw_bucket.cc
@@@ -1410,9 -1407,15 +1411,15 @@@ public
      if (ret < 0 && ret != -ENOENT)
        return ret;
  
+     // are we actually going to perform this put, or is it too old?
+     if (!check_versions(old_ot.read_version, orig_mtime,
+                       objv_tracker.write_version, mtime, sync_type)) {
+       return STATUS_NO_APPLY;
+     }
+ 
      objv_tracker.read_version = old_ot.read_version; /* maintain the obj version we just read */
  
 -    ret = store->put_bucket_entrypoint_info(entry, be, false, objv_tracker, mtime);
 +    ret = store->put_bucket_entrypoint_info(entry, be, false, objv_tracker, mtime, &attrs);
      if (ret < 0)
        return ret;
  

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

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

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

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

diff --cc src/rgw/rgw_rest_metadata.h
index 59d7c5f70455d5a378a485d653031f18d02349ac,8a95518288f56abf2c564ec582d7dfab2778a4c5..7f3cf1f2207aefd421b2f1e93051164c3651d55e
--- 1/src/rgw/rgw_rest_metadata.h
--- 2/src/rgw/rgw_rest_metadata.h
+++ b/src/rgw/rgw_rest_metadata.h
@@@ -48,7 -50,8 +50,8 @@@ public
      return caps.check_cap("metadata", RGW_CAP_WRITE);
    }
    void execute();
 -  virtual const char *name() { return "set_metadata"; }
+   void send_response();
 +  virtual const string name() { return "set_metadata"; }
  };
  
  class RGWOp_Metadata_Delete : public RGWRESTOp {