Merge remote-tracking branch 'gh/next'

Conflicts:
	src/mon/OSDMonitor.cc

diff --cc src/mon/AuthMonitor.cc
Simple merge

diff --cc src/mon/AuthMonitor.h
Simple merge

diff --cc src/mon/MDSMonitor.cc
index 35ef66af43d3f01705afcfd2e61a688af3da530e,c89709e102a4b9efd6d0784e47ffaee64dcc4e22..eafb1f04f10f3f0d78cb41b7af7f10d1935d4974
--- 1/src/mon/MDSMonitor.cc
--- 2/src/mon/MDSMonitor.cc
+++ b/src/mon/MDSMonitor.cc
@@@ -904,15 -867,8 +867,8 @@@ bool MDSMonitor::prepare_command(MMonCo
      ss << "removed failed mds." << w;
      string rs;
      getline(ss, rs);
 -    wait_for_finished_proposal(new Monitor::C_Command(mon, m, 0, rs, get_version()));
 +    wait_for_finished_proposal(new Monitor::C_Command(mon, m, 0, rs, get_last_committed()));
      return true;
-   } else if (prefix == "mds cluster_fail") {
-     r = cluster_fail(ss);
-     if (r < 0 && r == -EAGAIN) {
-       mon->osdmon()->wait_for_writeable(new C_RetryMessage(this,m));
-       return false; // don't propose yet; wait for message to be retried
-     }
- 
    } else if (prefix == "mds cluster_down") {
      if (pending_mdsmap.test_flag(CEPH_MDSMAP_DOWN)) {
        ss << "mdsmap already marked DOWN";

diff --cc src/mon/OSDMonitor.cc
Simple merge