gsadmin/rustfs
1
0
Fork 0
mirror of https://github.com/rustfs/rustfs.git synced 2026-08-25 21:46:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
# Conflicts:
#	Cargo.toml
#	iam/src/manager.rs
#	iam/src/store/object.rs
#	rustfs/src/admin/handlers/sts.rs
#	rustfs/src/main.rs
#	rustfs/src/storage/ecfs.rs
This commit is contained in:
houseme
2025-05-25 18:10:13 +08:00
parent dee19fdc35 864071d641
commit 2cadbba6ad
27 changed files with 5173 additions and 166 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Cargo.toml
+3 -3
View File
@@ -48,7 +48,7 @@ policy = { path = "./policy", version = "0.0.1" }
protos = { path = "./common/protos", version = "0.0.1" }
query = { path = "./s3select/query", version = "0.0.1" }
rustfs = { path = "./rustfs", version = "0.0.1" }
zip = { path = "./crates/zip", version = "0.0.1" }
rustfs-zip = { path = "./crates/zip", version = "0.0.1" }
rustfs-config = { path = "./crates/config", version = "0.0.1" }
rustfs-obs = { path = "crates/obs", version = "0.0.1" }
rustfs-event = { path = "crates/event", version = "0.0.1" }
@@ -166,7 +166,7 @@ snafu = "0.8.5"
snap = "1.1.1"
socket2 = "0.5.9"
strum = { version = "0.27.1", features = ["derive"] }
sysinfo = "0.34.2"
sysinfo = "0.35.1"
tempfile = "3.20.0"
test-case = "3.3.1"
thiserror = "2.0.12"
@@ -178,7 +178,7 @@ time = { version = "0.3.41", features = [
"serde",
] }
tokio = { version = "1.45.0", features = ["fs", "rt-multi-thread"] }
tokio = { version = "1.45.1", features = ["fs", "rt-multi-thread"] }
tokio-rustls = { version = "0.26.2", default-features = false }
tokio-stream = { version = "0.1.17" }
tokio-util = { version = "0.7.15", features = ["io", "compat"] }