From 5f2600a71decf3abb497c4bcd24996a93cafa802 Mon Sep 17 00:00:00 2001
From: Avi Kivity <avi@scylladb.com>
Date: Mon, 12 Mar 2018 19:37:27 +0200
Subject: [PATCH] migration_manager: remove dependency on messaging_service.hh
 in header

Use the new msg_addr.hh header to remove a dependency on
messaging_service.hh.
---
 locator/gossiping_property_file_snitch.cc | 2 ++
 service/migration_manager.hh              | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/locator/gossiping_property_file_snitch.cc b/locator/gossiping_property_file_snitch.cc
index c0a7b3c44b..aaa0d2fc8e 100644
--- a/locator/gossiping_property_file_snitch.cc
+++ b/locator/gossiping_property_file_snitch.cc
@@ -38,6 +38,8 @@
 
 #include "locator/gossiping_property_file_snitch.hh"
 #include "gms/versioned_value.hh"
+#include "message/msg_addr.hh"
+#include "message/messaging_service.hh"
 
 namespace locator {
 future<bool> gossiping_property_file_snitch::property_file_was_modified() {
diff --git a/service/migration_manager.hh b/service/migration_manager.hh
index 62a2a0eed2..5af2ee8cfb 100644
--- a/service/migration_manager.hh
+++ b/service/migration_manager.hh
@@ -46,7 +46,7 @@
 #include "db/schema_tables.hh"
 #include "core/distributed.hh"
 #include "gms/inet_address.hh"
-#include "message/messaging_service.hh"
+#include "message/msg_addr.hh"
 #include "utils/UUID.hh"
 #include "utils/serialized_action.hh"
 
@@ -56,7 +56,7 @@ namespace service {
 
 class migration_manager : public seastar::async_sharded_service<migration_manager> {
     std::vector<migration_listener*> _listeners;
-    std::unordered_map<netw::messaging_service::msg_addr, serialized_action, netw::messaging_service::msg_addr::hash> _schema_pulls;
+    std::unordered_map<netw::msg_addr, serialized_action, netw::msg_addr::hash> _schema_pulls;
     static const std::chrono::milliseconds migration_delay;
 public:
     migration_manager();