Merge remote-tracking branch 'origin/main' into arpad/pageserver_io_a…

…sync_kmerge_unified
neondatabase · Aug 7, 2023 · 33074b5 · 33074b5
2 parents b9c755e + 9559ef6
commit 33074b5
Show file tree

Hide file tree

Showing 11 changed files with 471 additions and 139 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/libs/remote_storage/Cargo.toml b/libs/remote_storage/Cargo.toml
@@ -20,6 +20,7 @@ tokio = { workspace = true, features = ["sync", "fs", "io-util"] }
 tokio-util.workspace = true
 toml_edit.workspace = true
 tracing.workspace = true
+scopeguard.workspace = true
 metrics.workspace = true
 utils.workspace = true
 pin-project-lite.workspace = true