From 387063a9cb29e49ac5f09caf2f548047790e9017 Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Sat, 11 Jan 2020 19:24:33 +0800 Subject: [PATCH] global/global_context: s/ceph::common/crimson::common/ it's an oversight in 4589fff6 Signed-off-by: Kefu Chai --- src/global/global_context.cc | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) 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 +#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 -- 2.39.5