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/model/k2v | |
| 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/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 37e142f6..4ab44c22 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() |