Merge branch 'next'

diff --cc src/osd/ReplicatedPG.cc
index c2bba1ee96d013f6ecba04ee4fb9bb6fc92c085f,a4b5e5240c99aa3e5b9a0a3d5a7106a8aaccf9bd..76ad5089493cfd3dce4376431a0429f205d91cef
--- 1/src/osd/ReplicatedPG.cc
--- 2/src/osd/ReplicatedPG.cc
+++ b/src/osd/ReplicatedPG.cc
@@@ -4624,11 -4638,9 +4638,9 @@@ void ReplicatedPG::sub_op_modify_applie
        // send ack to acker only if we haven't sent a commit already
        MOSDSubOpReply *ack = new MOSDSubOpReply(m, 0, get_osdmap()->get_epoch(), CEPH_OSD_FLAG_ACK);
        ack->set_priority(CEPH_MSG_PRIO_HIGH); // this better match commit priority!
 -      osd->cluster_messenger->send_message(ack, get_osdmap()->get_cluster_inst(rm->ackerosd));
 +      osd->send_message_osd_cluster(rm->ackerosd, ack, get_osdmap()->get_epoch());
      }
      
-     rm->applied = true;
-     
      assert(info.last_update >= m->version);
      assert(last_update_applied < m->version);
      last_update_applied = m->version;
@@@ -4670,10 -4682,8 +4682,8 @@@ void ReplicatedPG::sub_op_modify_commit
        MOSDSubOpReply *commit = new MOSDSubOpReply((MOSDSubOp*)rm->op->request, 0, get_osdmap()->get_epoch(), CEPH_OSD_FLAG_ONDISK);
        commit->set_last_complete_ondisk(rm->last_complete);
        commit->set_priority(CEPH_MSG_PRIO_HIGH); // this better match ack priority!
 -      osd->cluster_messenger->send_message(commit, get_osdmap()->get_cluster_inst(rm->ackerosd));
 +      osd->send_message_osd_cluster(rm->ackerosd, commit, get_osdmap()->get_epoch());
      }
-     
-     rm->committed = true;
    } else {
      dout(10) << "sub_op_modify_commit " << rm << " op " << *rm->op->request
             << " from epoch " << rm->epoch_started << " < last_peering_reset "