]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #62398 from AliMasarweh/wip-alimasa-rgw-standalone-zone
authorCasey Bodley <cbodley@users.noreply.github.com>
Mon, 5 May 2025 16:02:29 +0000 (12:02 -0400)
committerGitHub <noreply@github.com>
Mon, 5 May 2025 16:02:29 +0000 (12:02 -0400)
RGW/standalone: refactor rgw_zone.h with configstore

Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Daniel Gryniewicz <dang@redhat.com>
1  2 
src/rgw/driver/rados/rgw_data_sync.cc
src/rgw/driver/rados/rgw_data_sync.h
src/rgw/driver/rados/rgw_rados.cc
src/rgw/driver/rados/rgw_rados.h
src/rgw/radosgw-admin/radosgw-admin.cc
src/rgw/rgw_period_puller.cc
src/rgw/rgw_sal.h

Simple merge
Simple merge
Simple merge
Simple merge
index 54137a0b0d3842b636d56899d58d228b24b08e8f,862a9f3116ff621defa3de0a276220c4475f8c8c..9feffdfdf6b6f9e78d08ca6893c42ae0c3725ced
@@@ -4,9 -4,9 +4,10 @@@
  #include "rgw_rados.h"
  #include "rgw_zone.h"
  #include "rgw_rest_conn.h"
 +#include "rgw_http_errors.h"
  #include "common/ceph_json.h"
  #include "common/errno.h"
+ #include "rgw_sal_config.h"
  
  #include "services/svc_zone.h"
  
Simple merge