From: Kefu Chai <kchai@redhat.com>
Date: Sun, 9 Oct 2016 07:06:26 +0000 (+0800)
Subject: mon/MonClient: remove unnecessary include
X-Git-Tag: v12.0.1~412^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8e019f661cf5090f2f2046eecc2771fa2177908e;p=ceph.git

mon/MonClient: remove unnecessary include

Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/src/mds/MDSDaemon.cc b/src/mds/MDSDaemon.cc
index cc7e12b8b165..0db52f8b4954 100644
--- a/src/mds/MDSDaemon.cc
+++ b/src/mds/MDSDaemon.cc
@@ -56,6 +56,7 @@
 #include "messages/MCommandReply.h"
 
 #include "auth/AuthAuthorizeHandler.h"
+#include "auth/RotatingKeyRing.h"
 #include "auth/KeyRing.h"
 
 #include "common/config.h"
diff --git a/src/mgr/DaemonServer.cc b/src/mgr/DaemonServer.cc
index 798b01ec140d..ebbb6056059c 100644
--- a/src/mgr/DaemonServer.cc
+++ b/src/mgr/DaemonServer.cc
@@ -13,6 +13,8 @@
 
 #include "DaemonServer.h"
 
+#include "auth/RotatingKeyRing.h"
+
 #include "messages/MMgrOpen.h"
 #include "messages/MMgrConfigure.h"
 #include "messages/MCommand.h"
diff --git a/src/mon/MonClient.cc b/src/mon/MonClient.cc
index 1107e33eaedd..029bf51134ba 100644
--- a/src/mon/MonClient.cc
+++ b/src/mon/MonClient.cc
@@ -35,6 +35,7 @@
 
 #include "auth/Auth.h"
 #include "auth/KeyRing.h"
+#include "auth/AuthClientHandler.h"
 #include "auth/AuthMethodList.h"
 #include "auth/RotatingKeyRing.h"
 
diff --git a/src/mon/MonClient.h b/src/mon/MonClient.h
index 6081779721be..3e3a10a744c0 100644
--- a/src/mon/MonClient.h
+++ b/src/mon/MonClient.h
@@ -24,8 +24,6 @@
 #include "common/Timer.h"
 #include "common/Finisher.h"
 #include "common/config.h"
-#include "auth/AuthClientHandler.h"
-#include "auth/RotatingKeyRing.h"
 
 
 class MMonMap;
@@ -38,8 +36,8 @@ class LogClient;
 struct AuthAuthorizer;
 class AuthMethodList;
 class AuthClientHandler;
-// class RotatingKeyRing;
 class KeyRing;
+class RotatingKeyRing;
 
 struct MonClientPinger : public Dispatcher {
 
diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index cc0329a811af..4f166b7f4dbe 100644
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -130,6 +130,7 @@
 #include "osd/OpRequest.h"
 
 #include "auth/AuthAuthorizeHandler.h"
+#include "auth/RotatingKeyRing.h"
 #include "common/errno.h"
 
 #include "objclass/objclass.h"