Skip to content

Commit

Permalink
wip
Browse files Browse the repository at this point in the history
  • Loading branch information
andrewjstone committed Sep 29, 2023
1 parent 90ec972 commit 5c169ac
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 7 deletions.
1 change: 0 additions & 1 deletion sled-storage/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,4 @@ tokio.workspace = true
uuid.workspace = true

[dev-dependencies]
illumos-utils = { workspace = true, features = ["testing"] }
omicron-test-utils.workspace = true
7 changes: 1 addition & 6 deletions sled-storage/src/pool.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,9 @@
//! ZFS storage pool
use crate::error::Error;
use illumos_utils::zpool::{ZpoolInfo, ZpoolName};
use illumos_utils::zpool::{Zpool, ZpoolInfo, ZpoolName};
use omicron_common::disk::DiskIdentity;

#[cfg(test)]
use illumos_utils::zpool::MockZpool as Zpool;
#[cfg(not(test))]
use illumos_utils::zpool::Zpool;

/// A ZFS storage pool
#[derive(Debug, Clone)]
pub struct Pool {
Expand Down

0 comments on commit 5c169ac

Please sign in to comment.