]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
global/global_context: s/ceph::common/crimson::common/
authorKefu Chai <kchai@redhat.com>
Sat, 11 Jan 2020 11:24:33 +0000 (19:24 +0800)
committerKefu Chai <kchai@redhat.com>
Sat, 11 Jan 2020 11:26:45 +0000 (19:26 +0800)
it's an oversight in 4589fff6

Signed-off-by: Kefu Chai <kchai@redhat.com>
src/global/global_context.cc

index b6d42eaffec53f214c8f1e73b8c58005e3b52040..7a8825dcdc8769f7212316c6c824d0111ed1ab93 100644 (file)
  *
  */
 
-#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