Skip to content

Commit

Permalink
fix #5733 vs #5751 semantic merge conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
jgallagher committed May 14, 2024
1 parent a5e2999 commit e01eebd
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion nexus/tests/integration_tests/rack.rs
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ async fn test_sled_add(cptestctx: &ControlPlaneTestContext) {
assert_eq!(sled_id, repeat_sled_id);

// Now upsert the sled.
let nexus = &cptestctx.server.apictx().nexus;
let nexus = &cptestctx.server.server_context().nexus;
nexus
.datastore()
.sled_upsert(SledUpdate::new(
Expand Down

0 comments on commit e01eebd

Please sign in to comment.