Merge remote branch 'origin/wip_coverage'

Conflicts:
	src/mon/Monitor.cc

Signed-off-by: Josh Durgin <josh.durgin@dreamhost.com>

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

diff --cc src/mon/Monitor.cc
index 36d123777c00248c94bc91d22ccef9ac295385f7,4ece7a802eca0418cc834d58af3df77a9a459395..75fd0506d321d1ad501a6e3d9eac7378f2887ce5
--- 1/src/mon/Monitor.cc
--- 2/src/mon/Monitor.cc
+++ b/src/mon/Monitor.cc
@@@ -85,8 -86,14 +86,15 @@@ const CompatSet::Feature ceph_mon_featu
  const CompatSet::Feature ceph_mon_feature_incompat[] =
    { CEPH_MON_FEATURE_INCOMPAT_BASE , CompatSet::Feature(0, "")};
  
 -Monitor::Monitor(string nm, MonitorStore *s, Messenger *m, MonMap *map) :
+ #ifdef ENABLE_COVERAGE
+ void handle_signal(int signal)
+ {
+   exit(0);
+ }
+ #endif
+ 
 +Monitor::Monitor(CephContext* cct_, string nm, MonitorStore *s, Messenger *m, MonMap *map) :
 +  Dispatcher(cct_),
    name(nm),
    rank(-1), 
    messenger(m),

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

diff --cc src/osd/OSD.cc
Simple merge