MXS-2275 Fix breakage due to rebasing

2019-02-01 09:12:39 +02:00
parent 6d60714a17
commit 55b1e031d6
5 changed files with 29 additions and 19 deletions
--- a/server/modules/monitor/clustrixmon/clustrixnode.hh
+++ b/server/modules/monitor/clustrixmon/clustrixnode.hh
@ -160,7 +160,8 @@ public:
        m_pServer->is_active = false;
    }

-    bool can_be_used_as_hub(const MXS_MONITORED_SERVER::ConnectionSettings& sett);
+    bool can_be_used_as_hub(const char* zName,
+                            const MXS_MONITORED_SERVER::ConnectionSettings& settings);

    SERVER* server() const
    {