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

# Conflicts:
#	rustfs/src/storage/ecfs.rs
This commit is contained in:
houseme
2025-03-26 16:08:41 +08:00
127 changed files with 1505 additions and 3285 deletions
+1 -1
View File
@@ -3,10 +3,10 @@ use tracing::{instrument, warn};
use crate::{
disk::endpoint::{Endpoint, EndpointType},
disks_layout::DisksLayout,
error::{Error, Result},
global::global_rustfs_port,
utils::net::{self, XHost},
};
use common::error::{Error, Result};
use std::{
collections::{hash_map::Entry, HashMap, HashSet},
net::IpAddr,