update ceph source to reef 18.2.0

[ceph.git] / ceph / src / rgw / driver / json_config / store.cc

diff --git a/ceph/src/rgw/driver/json_config/store.cc b/ceph/src/rgw/driver/json_config/store.cc
index 330aa344dc522b98678598e0116b90a6e7408d51..cf5adda2512c20fd5b87ac2855b58fa89113b255 100644 (file)
--- a/ceph/src/rgw/driver/json_config/store.cc
+++ b/ceph/src/rgw/driver/json_config/store.cc
@@ -149,7 +149,8 @@ void sanity_check_config(const DoutPrefixProvider* dpp, DecodedConfig& config)
       throw std::system_error(-r, std::system_category());
     }
 
-    config.zonegroup.enabled_features = std::move(enable_features);
+    config.zonegroup.enabled_features.insert(rgw::zone_features::enabled.begin(),
+                                             rgw::zone_features::enabled.end());
   }
 
   // insert the default placement target if it doesn't exist