Merge branch 'unstable' into osd_pglog_checksums

diff --cc src/osd/PG.cc
index d5bfc6cb80660e52e03ea5b2c400e47d41e5f0c2,c05eed65cc6989b84de0305a7149b0dd89282c58..bb91accc16b6679bdaae1b134c8b4fa0421cd578
--- 1/src/osd/PG.cc
--- 2/src/osd/PG.cc
+++ b/src/osd/PG.cc
@@@ -2033,11 -2026,10 +2031,11 @@@ void PG::write_log(ObjectStore::Transac
      */
    }
    ondisklog.head = bl.length();
 -  
 +  ondisklog.has_checksums = true;
 +
    // write it
-   t.remove(meta_coll, log_oid );
-   t.write(meta_coll, log_oid , 0, bl.length(), bl);
+   t.remove(coll_t::META_COLL, log_oid );
+   t.write(coll_t::META_COLL, log_oid , 0, bl.length(), bl);
  
    bufferlist blb(sizeof(ondisklog));
    ::encode(ondisklog, blb);

diff --cc src/osd/PG.h
Simple merge