diff options
| author | Kefu Chai <kchai@redhat.com> | 2019-10-23 10:08:38 +0200 |
|---|---|---|
| committer | Kefu Chai <kchai@redhat.com> | 2019-10-24 06:37:30 +0200 |
| commit | 4589fff6bff8dadd7347fccfc62ed4a49e2b101d (patch) | |
| tree | 3643bcc9d3e29c60378980897cda62f58c3b2884 /src/mon/MonMap.h | |
| parent | crimson/osd/osd_operation.h: s/ceph_assert/assert/ (diff) | |
| download | ceph-4589fff6bff8dadd7347fccfc62ed4a49e2b101d.tar.xz ceph-4589fff6bff8dadd7347fccfc62ed4a49e2b101d.zip | |
crimson: s/ceph/crimson/ in namespace names
to help differentiate the symbols shared by classic and crimson osd,
after this change, all crimson code will live in "crimson::" namespaces.
and in a follow-up change, all classic code used by crimson will live in
"ceph::" namespaces.
Signed-off-by: Kefu Chai <kchai@redhat.com>
Diffstat (limited to 'src/mon/MonMap.h')
| -rw-r--r-- | src/mon/MonMap.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mon/MonMap.h b/src/mon/MonMap.h index 0432b4e83d5..a149b44ca8b 100644 --- a/src/mon/MonMap.h +++ b/src/mon/MonMap.h @@ -426,7 +426,7 @@ public: * @param errout std::ostream to send error messages too */ #ifdef WITH_SEASTAR - seastar::future<> build_initial(const ceph::common::ConfigProxy& conf, bool for_mkfs); + seastar::future<> build_initial(const crimson::common::ConfigProxy& conf, bool for_mkfs); #else int build_initial(CephContext *cct, bool for_mkfs, std::ostream& errout); #endif @@ -485,7 +485,7 @@ protected: seastar::future<> read_monmap(const std::string& monmap); /// try to build monmap with different settings, like /// mon_host, mon* sections, and mon_dns_srv_name - seastar::future<> build_monmap(const ceph::common::ConfigProxy& conf, bool for_mkfs); + seastar::future<> build_monmap(const crimson::common::ConfigProxy& conf, bool for_mkfs); /// initialize monmap by resolving given service name seastar::future<> init_with_dns_srv(bool for_mkfs, const std::string& name); #else |