diff options
| author | Alex Auvolat <alex@adnab.me> | 2024-02-15 13:58:15 +0100 |
|---|---|---|
| committer | Alex Auvolat <alex@adnab.me> | 2024-02-15 14:06:34 +0100 |
| commit | eb4a6ce1060a847be0b62c6a10ff3ba956e3f34d (patch) | |
| tree | 84f6746ec92ca3a5344da22edadcd1ac3413aa29 /src/block | |
| parent | cf2af186fcc0c8f581a966454b6cd4720d3821f0 (diff) | |
| parent | 7be3f15e45fcfff10a45302a040c2919a3ba8ccd (diff) | |
| download | garage-eb4a6ce1060a847be0b62c6a10ff3ba956e3f34d.tar.gz garage-eb4a6ce1060a847be0b62c6a10ff3ba956e3f34d.zip | |
Merge branch 'main' into next-0.10
Diffstat (limited to 'src/block')
| -rw-r--r-- | src/block/Cargo.toml | 1 | ||||
| -rw-r--r-- | src/block/manager.rs | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/block/Cargo.toml b/src/block/Cargo.toml index 7cf82ce6..b5763120 100644 --- a/src/block/Cargo.toml +++ b/src/block/Cargo.toml @@ -15,6 +15,7 @@ path = "lib.rs" [dependencies] garage_db.workspace = true +garage_net.workspace = true garage_rpc.workspace = true garage_util.workspace = true garage_table.workspace = true diff --git a/src/block/manager.rs b/src/block/manager.rs index aae1ce45..5283886c 100644 --- a/src/block/manager.rs +++ b/src/block/manager.rs @@ -20,7 +20,7 @@ use opentelemetry::{ Context, }; -use garage_rpc::rpc_helper::netapp::stream::{stream_asyncread, ByteStream}; +use garage_net::stream::{stream_asyncread, ByteStream}; use garage_db as db; |