Skip to content

Commit

Permalink
Fix merge conflict with myself (#7010)
Browse files Browse the repository at this point in the history
  • Loading branch information
smklein authored Nov 7, 2024
1 parent d8f231e commit c4c4d96
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions nexus/reconfigurator/planning/src/system.rs
Original file line number Diff line number Diff line change
Expand Up @@ -845,9 +845,9 @@ impl Sled {
name: config.name.full_name(),
available: ByteCount::from_gibibytes_u32(1),
used: ByteCount::from_gibibytes_u32(0),
quota: config.quota,
reservation: config.reservation,
compression: config.compression.to_string(),
quota: config.inner.quota,
reservation: config.inner.reservation,
compression: config.inner.compression.to_string(),
});
}

Expand Down

0 comments on commit c4c4d96

Please sign in to comment.