diff options
| author | Alex Auvolat <lx@deuxfleurs.fr> | 2025-02-01 19:07:17 +0100 |
|---|---|---|
| committer | Alex Auvolat <lx@deuxfleurs.fr> | 2025-02-01 19:07:17 +0100 |
| commit | fe937c290195e5451f9e533e02664548817e6e13 (patch) | |
| tree | 318ba12ff76dc3e435a01a246188c6a964e572f2 /src/garage/server.rs | |
| parent | 3192088aac0e1795401304a8dec715cd343538cf (diff) | |
| parent | d601f311865b8159a7bf1801dd8f43021d0b443b (diff) | |
| download | garage-fe937c290195e5451f9e533e02664548817e6e13.tar.gz garage-fe937c290195e5451f9e533e02664548817e6e13.zip | |
Merge branch 'main' into next-v2
Diffstat (limited to 'src/garage/server.rs')
| -rw-r--r-- | src/garage/server.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/garage/server.rs b/src/garage/server.rs index 65bf34db..9e58fa6d 100644 --- a/src/garage/server.rs +++ b/src/garage/server.rs @@ -6,13 +6,13 @@ use garage_util::background::*; use garage_util::config::*; use garage_util::error::Error; -use garage_api::admin::api_server::AdminApiServer; -use garage_api::s3::api_server::S3ApiServer; +use garage_api_admin::api_server::AdminApiServer; +use garage_api_s3::api_server::S3ApiServer; use garage_model::garage::Garage; use garage_web::WebServer; #[cfg(feature = "k2v")] -use garage_api::k2v::api_server::K2VApiServer; +use garage_api_k2v::api_server::K2VApiServer; use crate::admin::*; use crate::secrets::{fill_secrets, Secrets}; |