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/api/admin/api_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/api/admin/api_server.rs')
| -rw-r--r-- | src/api/admin/api_server.rs | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/api/admin/api_server.rs b/src/api/admin/api_server.rs index d66714db..be29e617 100644 --- a/src/api/admin/api_server.rs +++ b/src/api/admin/api_server.rs @@ -19,15 +19,15 @@ use garage_model::garage::Garage; use garage_util::error::Error as GarageError; use garage_util::socket_address::UnixOrTCPSocketAddress; -use crate::generic_server::*; - -use crate::admin::api::*; -use crate::admin::error::*; -use crate::admin::router_v0; -use crate::admin::router_v1; -use crate::admin::Authorization; -use crate::admin::EndpointHandler; -use crate::helpers::*; +use garage_api_common::generic_server::*; +use garage_api_common::helpers::*; + +use crate::api::*; +use crate::error::*; +use crate::router_v0; +use crate::router_v1; +use crate::Authorization; +use crate::EndpointHandler; pub type ResBody = BoxBody<Error>; |