Merge commit 'origin/unstable' into msgr

Conflicts:

	src/mon/ClientMonitor.cc

diff --cc src/Makefile.am
Simple merge

diff --cc src/client/Client.cc
Simple merge

diff --cc src/client/Client.h
Simple merge

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

diff --cc src/mds/Server.cc
Simple merge

diff --cc src/mon/ClientMonitor.cc
index 3fe2b985b0996bc2711fb9899ccdcf28c638975c,f5374d26346bef00d3f974076eb47f00038b6f2b..aa39c302703fbdf0d7494d94b978dee90843c42c
--- 1/src/mon/ClientMonitor.cc
--- 2/src/mon/ClientMonitor.cc
+++ b/src/mon/ClientMonitor.cc
@@@ -247,6 -347,31 +247,11 @@@ void ClientMonitor::_mounted(__s64 clie
    delete m;
  }
  
 -void ClientMonitor::_unmounted(MClientUnmount *m)
 -{
 -  dout(10) << "_unmounted " << m->get_orig_source_inst() << dendl;
 -  
 -  // reply with (same) unmount message
 -  mon->messenger->send_message(m, m->get_orig_source_inst());
 -
 -  // auto-shutdown?
 -  // (hack for fakesyn/newsyn, mostly)
 -  if (mon->is_leader() &&
 -      client_map.version > 1 &&
 -      client_map.client_info.empty() && 
 -      g_conf.mon_stop_on_last_unmount &&
 -      !mon->is_stopping()) {
 -    dout(1) << "last client unmounted" << dendl;
 -    mon->stop_cluster();
 -  }
 -}
 -
 -
+ bool ClientMonitor::should_propose(double& delay)
+ {
+   return true;  // never delay!  we want fast mounts!
+ }
+ 
  void ClientMonitor::tick()
  {
    if (!paxos->is_active()) return;

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