]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
Merge pull request #63687 from samarahu/wip-samarahu-standalone-user
authorSamarah Uriarte <56163967+samarahu@users.noreply.github.com>
Tue, 2 Sep 2025 13:59:06 +0000 (08:59 -0500)
committerGitHub <noreply@github.com>
Tue, 2 Sep 2025 13:59:06 +0000 (08:59 -0500)
Reviewed-by: Daniel Gryniewicz <dang@redhat.com>
Reviewed-by: Matt Benjamin <mbenjamin@redhat.com>
1  2 
src/common/options/rgw.yaml.in
src/rgw/CMakeLists.txt
src/rgw/driver/posix/rgw_sal_posix.cc
src/rgw/driver/posix/rgw_sal_posix.h
src/rgw/rgw_common.cc
src/rgw/rgw_sal.cc
src/vstart.sh

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index c50033ad0172636f32247953180dc47a1e7b7348,b7b848790df394c965af55bece2adcd1172434f6..ea4e6bd26c63d908439b0ba117fa3ae6e6298656
@@@ -62,12 -67,9 +69,9 @@@ extern rgw::sal::Driver* newMotrStore(C
  #ifdef WITH_RADOSGW_DAOS
  extern rgw::sal::Driver* newDaosStore(CephContext *cct);
  #endif
- #ifdef WITH_RADOSGW_POSIX
- extern rgw::sal::Driver* newPOSIXDriver(rgw::sal::Driver* next);
- #endif
  extern rgw::sal::Driver* newBaseFilter(rgw::sal::Driver* next);
  #ifdef WITH_RADOSGW_D4N
 -extern rgw::sal::Driver* newD4NFilter(rgw::sal::Driver* next, boost::asio::io_context& io_context);
 +extern rgw::sal::Driver* newD4NFilter(rgw::sal::Driver* next, boost::asio::io_context& io_context, bool admin);
  #endif
  }
  
diff --cc src/vstart.sh
Simple merge