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>

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

diff --cc src/mon/MonmapMonitor.h
index 0b5f37cc372b11b1bd4630d2c44f4978b10c8d6e,49dc5cb179e82f03a28474ea207dfff109098cb2..ecfbe1e1225941edc2c740871ea179e945e3db6e
--- 1/src/mon/MonmapMonitor.h
--- 2/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