From: Sage Weil <sage@redhat.com>
Date: Sat, 30 Jan 2016 13:59:37 +0000 (-0500)
Subject: Merge pull request #7418 from renhwsky/renhw-wip-monmapmonitor-cleanup
X-Git-Tag: v10.0.4~108
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=27c0d2b19db790e9f515f312cd5ec9d22550ef3e;p=ceph.git

Merge pull request #7418 from renhwsky/renhw-wip-monmapmonitor-cleanup

mon: some cleanup in MonmapMonitor.cc

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Joao Eduardo Luis <joao@suse.de>
---

27c0d2b19db790e9f515f312cd5ec9d22550ef3e
diff --cc src/mon/MonmapMonitor.h
index 0b5f37cc372b,49dc5cb179e8..ecfbe1e12259
--- a/src/mon/MonmapMonitor.h
+++ b/src/mon/MonmapMonitor.h
@@@ -68,11 -68,9 +68,10 @@@ class MonmapMonitor : public PaxosServi
    bool prepare_command(MonOpRequestRef op);
  
    void get_health(list<pair<health_status_t,string> >& summary,
 -		  list<pair<health_status_t,string> > *detail) const;
 +		  list<pair<health_status_t,string> > *detail,
 +		  CephContext *cct) const override;
  
    int get_monmap(bufferlist &bl);
-   int get_monmap(MonMap &m);
  
    /*
     * Since monitors are pretty