From: Josh Durgin <josh.durgin@dreamhost.com>
Date: Fri, 10 Jun 2011 18:28:09 +0000 (-0700)
Subject: Merge remote branch 'origin/wip_coverage'
X-Git-Tag: v0.30~78
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=08d0d0ae21805f22e2b5cccb39784d94830c114c;p=ceph.git

Merge remote branch 'origin/wip_coverage'

Conflicts:
	src/mon/Monitor.cc

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

08d0d0ae21805f22e2b5cccb39784d94830c114c
diff --cc src/mon/Monitor.cc
index 36d123777c00,4ece7a802eca..75fd0506d321
--- a/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, "")};
  
+ #ifdef ENABLE_COVERAGE
+ void handle_signal(int signal)
+ {
+   exit(0);
+ }
+ #endif
+ 
 -Monitor::Monitor(string nm, MonitorStore *s, Messenger *m, MonMap *map) :
 +Monitor::Monitor(CephContext* cct_, string nm, MonitorStore *s, Messenger *m, MonMap *map) :
 +  Dispatcher(cct_),
    name(nm),
    rank(-1), 
    messenger(m),