Skip to content

Commit

Permalink
fix #5743 vs. #5751 semantic merge conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
iliana committed May 14, 2024
1 parent 3dd9ec3 commit d2031a2
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion nexus/reconfigurator/execution/src/sled_state.rs
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ mod tests {
async fn test_decommission_is_idempotent(
cptestctx: &ControlPlaneTestContext,
) {
let nexus = &cptestctx.server.apictx().nexus;
let nexus = &cptestctx.server.server_context().nexus;
let datastore = nexus.datastore();
let opctx = OpContext::for_tests(
cptestctx.logctx.log.clone(),
Expand Down

0 comments on commit d2031a2

Please sign in to comment.