Merge branch 'rgw'

Conflicts:

	src/rgw/rgw_common.h

diff --cc src/rgw/rgw_common.h
index 1c26bddc4cc680f65484ed2dee2207b70fba27f5,5730c9feaf478a2440fe081646e50ebf36f408f1..04611c8e92bae86c9ddafa16ec007111b23b1a3e
--- 1/src/rgw/rgw_common.h
--- 2/src/rgw/rgw_common.h
+++ b/src/rgw/rgw_common.h
@@@ -262,30 -265,9 +265,9 @@@ struct RGWObjEnt 
    size_t size;
    time_t mtime;
    // two md5 digests and a terminator
 -  char etag[ceph::crypto::MD5::DIGESTSIZE * 2 + 1];
 +  char etag[CEPH_CRYPTO_MD5_DIGESTSIZE * 2 + 1];
- 
-   void encode(bufferlist& bl) const {
-     __u8 struct_v = 1;
-     ::encode(struct_v, bl);
-     uint64_t s = size;
-     __u32 mt = mtime;
-     ::encode(name, bl);
-     ::encode(s, bl);
-     ::encode(mt, bl);
-   }
-   void decode(bufferlist::iterator& bl) {
-     __u8 struct_v;
-     ::decode(struct_v, bl);
-     __u32 mt;
-     uint64_t s;
-     ::decode(name, bl);
-     ::decode(s, bl);
-     ::decode(mt, bl);
-     size = s;
-     mtime = mt;
-   }
+   string content_type;
  };
- WRITE_CLASS_ENCODER(RGWObjEnt)
  
  /** Store basic data on an object */
  struct RGWBucketEnt {

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

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