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/cli_v2 | |
| 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/cli_v2')
| -rw-r--r-- | src/garage/cli_v2/bucket.rs | 2 | ||||
| -rw-r--r-- | src/garage/cli_v2/cluster.rs | 2 | ||||
| -rw-r--r-- | src/garage/cli_v2/key.rs | 2 | ||||
| -rw-r--r-- | src/garage/cli_v2/layout.rs | 2 | ||||
| -rw-r--r-- | src/garage/cli_v2/mod.rs | 4 |
5 files changed, 6 insertions, 6 deletions
diff --git a/src/garage/cli_v2/bucket.rs b/src/garage/cli_v2/bucket.rs index 837ce783..ee3b6800 100644 --- a/src/garage/cli_v2/bucket.rs +++ b/src/garage/cli_v2/bucket.rs @@ -3,7 +3,7 @@ use format_table::format_table; use garage_util::error::*; -use garage_api::admin::api::*; +use garage_api_admin::api::*; use crate::cli as cli_v1; use crate::cli::structs::*; diff --git a/src/garage/cli_v2/cluster.rs b/src/garage/cli_v2/cluster.rs index 34a28674..6eb65d12 100644 --- a/src/garage/cli_v2/cluster.rs +++ b/src/garage/cli_v2/cluster.rs @@ -2,7 +2,7 @@ use format_table::format_table; use garage_util::error::*; -use garage_api::admin::api::*; +use garage_api_admin::api::*; use crate::cli::structs::*; use crate::cli_v2::layout::*; diff --git a/src/garage/cli_v2/key.rs b/src/garage/cli_v2/key.rs index ff403a9a..b956906d 100644 --- a/src/garage/cli_v2/key.rs +++ b/src/garage/cli_v2/key.rs @@ -2,7 +2,7 @@ use format_table::format_table; use garage_util::error::*; -use garage_api::admin::api::*; +use garage_api_admin::api::*; use crate::cli::structs::*; use crate::cli_v2::*; diff --git a/src/garage/cli_v2/layout.rs b/src/garage/cli_v2/layout.rs index d44771c7..2f14b332 100644 --- a/src/garage/cli_v2/layout.rs +++ b/src/garage/cli_v2/layout.rs @@ -3,7 +3,7 @@ use format_table::format_table; use garage_util::error::*; -use garage_api::admin::api::*; +use garage_api_admin::api::*; use crate::cli::layout as cli_v1; use crate::cli::structs::*; diff --git a/src/garage/cli_v2/mod.rs b/src/garage/cli_v2/mod.rs index 692b7c1c..6cc13b2d 100644 --- a/src/garage/cli_v2/mod.rs +++ b/src/garage/cli_v2/mod.rs @@ -12,8 +12,8 @@ use garage_util::error::*; use garage_rpc::system::*; use garage_rpc::*; -use garage_api::admin::api::*; -use garage_api::admin::EndpointHandler as AdminApiEndpoint; +use garage_api_admin::api::*; +use garage_api_admin::EndpointHandler as AdminApiEndpoint; use crate::admin::*; use crate::cli as cli_v1; |