diff options
| author | trinity-1686a <trinity@deuxfleurs.fr> | 2025-02-08 16:01:11 +0100 |
|---|---|---|
| committer | trinity-1686a <trinity@deuxfleurs.fr> | 2025-02-08 16:01:11 +0100 |
| commit | f034e834fa70f579bfd85745aea533b4328cbce4 (patch) | |
| tree | 0ec66ad7ad96ea32b8582f1c0566959c17f4b823 /src/garage/server.rs | |
| parent | bf0f7924189444683077ce80b7d72303b2b20145 (diff) | |
| parent | d3226bfa91d4500063c5c287c6256729dcbb3f88 (diff) | |
| download | garage-f034e834fa70f579bfd85745aea533b4328cbce4.tar.gz garage-f034e834fa70f579bfd85745aea533b4328cbce4.zip | |
Merge branch 'main' into 1686a/s3-redirects
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}; |