Merge branch 'snaps' into unstable

diff --cc src/include/librados.h
Simple merge

diff --cc src/include/librados.hpp
Simple merge

diff --cc src/librados.cc
Simple merge

diff --cc src/messages/MPoolOp.h
Simple merge

diff --cc src/mon/OSDMonitor.cc
index 40b7e312b00a8b856f611667976926c76d4c7e6b,16eb07c1bc952c2fca1d77c1156cfdb7795a0ca4..18bd200d59f68bd23dea97cfa7b9533b2b1147dd
--- 1/src/mon/OSDMonitor.cc
--- 2/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@@ -1490,7 -1524,7 +1530,7 @@@ void OSDMonitor::_pool_op(MPoolOp *m, i
  {
    dout(20) << "_pool_op returning with replyCode " << replyCode << dendl;
    MPoolOpReply *reply = new MPoolOpReply(m->fsid, m->get_tid(),
-                                        replyCode, epoch, mon->get_epoch());
+                                        replyCode, epoch, mon->get_epoch(), blp);
    mon->send_reply(m, reply);
 -  delete m;
 +  m->put();
  }

diff --cc src/osd/OSD.cc
Simple merge

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

diff --cc src/osdc/Objecter.cc
Simple merge