Merge remote-tracking branch 'gh/wip-mon-lag'

Reviewed-by: Sage Weil <sage@newdream.net>

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

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

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

diff --cc src/mon/PGMonitor.cc
index 5ae809f7e0b8fe757454ed6f92f11b0529174aeb,c2b0566972f7e57d250a5978fdde356f70b8f69b..e2fb70621a4285a1b5a9befa3836a1dd754616c9
--- 1/src/mon/PGMonitor.cc
--- 2/src/mon/PGMonitor.cc
+++ b/src/mon/PGMonitor.cc
@@@ -201,15 -195,9 +201,15 @@@ void PGMonitor::tick(
  void PGMonitor::create_initial()
  {
    dout(10) << "create_initial -- creating initial map" << dendl;
 +  pg_map.full_ratio = g_conf->mon_osd_full_ratio;
 +  if (pg_map.full_ratio > 1.0)
 +    pg_map.full_ratio /= 100.0;
 +  pg_map.nearfull_ratio = g_conf->mon_osd_nearfull_ratio;
 +  if (pg_map.nearfull_ratio > 1.0)
 +    pg_map.nearfull_ratio /= 100.0;
  }
  
- bool PGMonitor::update_from_paxos()
+ void PGMonitor::update_from_paxos()
  {
    version_t paxosv = paxos->get_version();
    if (paxosv == pg_map.version)