From: Sage Weil <sage@inktank.com>
Date: Wed, 3 Jul 2013 02:43:17 +0000 (-0700)
Subject: Merge remote-tracking branch 'gh/next'
X-Git-Tag: v0.67-rc1~163
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=9376ce4f085677e6c307a2b873a380465b308489;p=ceph.git

Merge remote-tracking branch 'gh/next'

Conflicts:
	src/mon/OSDMonitor.cc
---

9376ce4f085677e6c307a2b873a380465b308489
diff --cc src/mon/MDSMonitor.cc
index 35ef66af43d3,c89709e102a4..eafb1f04f10f
--- a/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";