gsadmin/rustfs
1
0
Fork 0
mirror of https://github.com/rustfs/rustfs.git synced 2026-08-19 19:16:17 +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.lock
#	Cargo.toml
This commit is contained in:
houseme
2025-06-06 15:52:32 +08:00
parent 4199bf2ba4 1f62c35846
commit 77ddd1cfe0
40 changed files with 5753 additions and 244 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/obs/Cargo.toml
+1 -1
View File
@@ -39,7 +39,7 @@ tracing-error = { workspace = true }
tracing-opentelemetry = { workspace = true }
tracing-subscriber = { workspace = true, features = ["registry", "std", "fmt", "env-filter", "tracing-log", "time", "local-time", "json"] }
tokio = { workspace = true, features = ["sync", "fs", "rt-multi-thread", "rt", "time", "macros"] }
reqwest = { workspace = true, optional = true, default-features = false }
reqwest = { workspace = true, optional = true }
serde_json = { workspace = true }
sysinfo = { workspace = true }
thiserror = { workspace = true }
crates/zip/Cargo.toml
+1 -1
View File
@@ -18,7 +18,7 @@ async-compression = { version = "0.4.0", features = [
] }
async_zip = { version = "0.0.17", features = ["tokio"] }
zip = "2.2.0"
tokio = { version = "1.45.0", features = ["full"] }
tokio = { workspace = true, features = ["full"] }
tokio-stream = "0.1.17"
tokio-tar = { workspace = true }
xz2 = { version = "0.1", optional = true, features = ["static"] }