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/model/k2v | |
| 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/model/k2v')
| -rw-r--r-- | src/model/k2v/rpc.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/model/k2v/rpc.rs b/src/model/k2v/rpc.rs index 3c759181..e15f2df8 100644 --- a/src/model/k2v/rpc.rs +++ b/src/model/k2v/rpc.rs @@ -296,7 +296,7 @@ impl K2VRpcHandler { }; // Send the request to all nodes, use FuturesUnordered to get the responses in any order - let msg = msg.into_req().map_err(netapp::error::Error::from)?; + let msg = msg.into_req().map_err(garage_net::error::Error::from)?; let rs = RequestStrategy::with_priority(PRIO_NORMAL).without_timeout(); let mut requests = nodes .iter() |