aboutsummaryrefslogtreecommitdiff
path: root/src/garage/server.rs
diff options
context:
space:
mode:
authorAlex <lx@deuxfleurs.fr>2025-02-01 17:48:25 +0000
committerAlex <lx@deuxfleurs.fr>2025-02-01 17:48:25 +0000
commitd601f311865b8159a7bf1801dd8f43021d0b443b (patch)
tree07e4268d09a6bead4c4e5a2a4f122471a7a5d23b /src/garage/server.rs
parent9330fd79d3466051394f6d419a247d46da8f5151 (diff)
parente4de7bdfd5e6acc05309f59d7f77755f0807e8e4 (diff)
downloadgarage-d601f311865b8159a7bf1801dd8f43021d0b443b.tar.gz
garage-d601f311865b8159a7bf1801dd8f43021d0b443b.zip
Merge pull request 'split garage_api in garage_api_{common,s3,k2v,admin}' (#947) from split-garage-api into main
Reviewed-on: https://git.deuxfleurs.fr/Deuxfleurs/garage/pulls/947
Diffstat (limited to 'src/garage/server.rs')
-rw-r--r--src/garage/server.rs6
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};