Merge branch 'main' of github.com:rustfs/s3-rustfs into feature/observability-metrics

# Conflicts:
#	crates/utils/Cargo.toml
#	ecstore/src/store_list_objects.rs
#	iam/src/manager.rs
#	rustfs/src/admin/rpc.rs
This commit is contained in:
houseme
2025-06-20 12:58:47 +08:00
38 changed files with 676 additions and 342 deletions
+1 -1
View File
@@ -5,7 +5,7 @@ use crate::bucket::metadata_sys::get_replication_config;
use crate::bucket::versioning_sys::BucketVersioningSys;
use crate::error::Error;
use crate::new_object_layer_fn;
use crate::peer::RemotePeerS3Client;
use crate::rpc::RemotePeerS3Client;
use crate::store;
use crate::store_api::ObjectIO;
use crate::store_api::ObjectInfo;