rebase

oxidecomputer · Sep 17, 2023 · e266136 · e266136
1 parent 403d224
commit e266136
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/nexus/src/app/sagas/disk_create.rs b/nexus/src/app/sagas/disk_create.rs
@@ -12,11 +12,10 @@ use super::{
     ACTION_GENERATE_ID,
 };
 use crate::app::sagas::declare_saga_actions;
+use crate::app::{authn, authz, db};
 use crate::external_api::params;
-use nexus_db_queries::db::datastore::RegionAllocationStrategy;
 use nexus_db_queries::db::identity::{Asset, Resource};
 use nexus_db_queries::db::lookup::LookupPath;
-use crate::{authn, authz, db};
 use omicron_common::api::external::DiskState;
 use omicron_common::api::external::Error;
 use rand::{rngs::StdRng, RngCore, SeedableRng};

diff --git a/nexus/src/app/sagas/snapshot_create.rs b/nexus/src/app/sagas/snapshot_create.rs
@@ -100,12 +100,11 @@ use super::{
 };
 use crate::app::sagas::declare_saga_actions;
 use crate::app::sagas::retry_until_known_result;
+use crate::app::{authn, authz, db};
 use crate::external_api::params;
-use crate::{authn, authz, db};
 use anyhow::anyhow;
 use crucible_agent_client::{types::RegionId, Client as CrucibleAgentClient};
 use nexus_db_model::Generation;
-use nexus_db_queries::db::datastore::RegionAllocationStrategy;
 use nexus_db_queries::db::identity::{Asset, Resource};
 use nexus_db_queries::db::lookup::LookupPath;
 use omicron_common::api::external;