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/garage | |
| 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/garage')
| -rw-r--r-- | src/garage/Cargo.toml | 3 | ||||
| -rw-r--r-- | src/garage/main.rs | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/src/garage/Cargo.toml b/src/garage/Cargo.toml index 41fd32a1..65135530 100644 --- a/src/garage/Cargo.toml +++ b/src/garage/Cargo.toml @@ -26,6 +26,7 @@ garage_db.workspace = true garage_api.workspace = true garage_block.workspace = true garage_model.workspace = true +garage_net.workspace = true garage_rpc.workspace = true garage_table.workspace = true garage_util.workspace = true @@ -53,8 +54,6 @@ futures.workspace = true futures-util.workspace = true tokio.workspace = true -netapp.workspace = true - opentelemetry.workspace = true opentelemetry-prometheus = { workspace = true, optional = true } opentelemetry-otlp = { workspace = true, optional = true } diff --git a/src/garage/main.rs b/src/garage/main.rs index 1a6a6e32..4d8dcc67 100644 --- a/src/garage/main.rs +++ b/src/garage/main.rs @@ -26,8 +26,8 @@ use std::path::PathBuf; use structopt::StructOpt; -use netapp::util::parse_and_resolve_peer_addr; -use netapp::NetworkKey; +use garage_net::util::parse_and_resolve_peer_addr; +use garage_net::NetworkKey; use garage_util::error::*; |