From: Kefu Chai <kchai@redhat.com>
Date: Sat, 11 Jan 2020 11:24:33 +0000 (+0800)
Subject: global/global_context: s/ceph::common/crimson::common/
X-Git-Tag: v15.1.0~241^2~1
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=387063a9cb29e49ac5f09caf2f548047790e9017;p=ceph-ci.git

global/global_context: s/ceph::common/crimson::common/

it's an oversight in 4589fff6

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

diff --git a/src/global/global_context.cc b/src/global/global_context.cc
index b6d42eaffec..7a8825dcdc8 100644
--- a/src/global/global_context.cc
+++ b/src/global/global_context.cc
@@ -12,10 +12,13 @@
  *
  */
 
-#include "common/ceph_context.h"
 #include "global/global_context.h"
 
 #include <string.h>
+#include "common/ceph_context.h"
+#ifdef WITH_SEASTAR
+#include "crimson/common/config_proxy.h"
+#endif
 
 
 /*
@@ -24,7 +27,7 @@
 CephContext *g_ceph_context = NULL;
 ConfigProxy& g_conf() {
 #ifdef WITH_SEASTAR
-  return ceph::common::local_conf();
+  return crimson::common::local_conf();
 #else
   return g_ceph_context->_conf;
 #endif