diff options
| author | Alex <alex@adnab.me> | 2024-02-15 12:51:52 +0000 |
|---|---|---|
| committer | Alex <alex@adnab.me> | 2024-02-15 12:51:52 +0000 |
| commit | 7be3f15e45fcfff10a45302a040c2919a3ba8ccd (patch) | |
| tree | eb32dadec4de88e5ec69dbdf5e73f68f9299201a /src/block/manager.rs | |
| parent | a2ab275da80159ea2f0606d129790d79d43b4e24 (diff) | |
| parent | 125c662860621f9c834e254d62b29b5d5ace5dd4 (diff) | |
| download | garage-7be3f15e45fcfff10a45302a040c2919a3ba8ccd.tar.gz garage-7be3f15e45fcfff10a45302a040c2919a3ba8ccd.zip | |
Merge pull request 'import Netapp code into Garage codebase' (#717) from import-netapp into main
Reviewed-on: https://git.deuxfleurs.fr/Deuxfleurs/garage/pulls/717
Diffstat (limited to 'src/block/manager.rs')
| -rw-r--r-- | src/block/manager.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/block/manager.rs b/src/block/manager.rs index 5388f69d..848d9141 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; |