Merge remote-tracking branch 'origin/main' into overtrue/fix-1905-activation-fence

# Conflicts:
#	crates/ecstore/src/core/pools.rs
This commit is contained in:
overtrue
2026-08-23 02:36:20 +08:00
48 changed files with 3880 additions and 1035 deletions
+1 -1
View File
@@ -1294,7 +1294,7 @@ impl crate::storage_api_contracts::object::ObjectIO for SetDisks {
(prepared.snapshot, prepared.object_info)
} else {
match self
.get_object_fileinfo(
.get_object_fileinfo_for_get_object_reader(
bucket,
object,
opts,