import quincy beta 17.1.0

[ceph.git] / ceph / src / librbd / api / Config.cc

diff --git a/ceph/src/librbd/api/Config.cc b/ceph/src/librbd/api/Config.cc
index 174e9a588647ef5272d7d21d6e65e1e0aaebe980..8148607e39ff217ef48620a62689cb5058f7cf8d 100644 (file)
--- a/ceph/src/librbd/api/Config.cc
+++ b/ceph/src/librbd/api/Config.cc
@@ -28,7 +28,6 @@ typedef std::map<std::string_view, std::pair<std::string, config_source_t>> Pare
 static std::set<std::string_view> EXCLUDE_OPTIONS {
     "rbd_auto_exclusive_lock_until_manual_request",
     "rbd_default_format",
-    "rbd_default_map_options",
     "rbd_default_pool",
     "rbd_discard_on_zeroed_write_same",
     "rbd_op_thread_timeout",
@@ -36,7 +35,8 @@ static std::set<std::string_view> EXCLUDE_OPTIONS {
     "rbd_tracing",
     "rbd_validate_names",
     "rbd_validate_pool",
-    "rbd_mirror_pool_replayers_refresh_interval"
+    "rbd_mirror_pool_replayers_refresh_interval",
+    "rbd_config_pool_override_update_timestamp"
   };
 static std::set<std::string_view> EXCLUDE_IMAGE_OPTIONS {
     "rbd_default_clone_format",