Skip to content
This repository has been archived by the owner on Jul 2, 2024. It is now read-only.

DEVPROD-1661 fix merge conflict #2195

Merged
merged 1 commit into from
Dec 15, 2023
Merged

DEVPROD-1661 fix merge conflict #2195

merged 1 commit into from
Dec 15, 2023

Conversation

ybrill
Copy link
Contributor

@ybrill ybrill commented Dec 14, 2023

DEVPROD-1661

Description

#2183 added a required field after #2188 added test data without the required field.

@ybrill ybrill requested a review from sophstad December 14, 2023 21:53
Copy link

cypress bot commented Dec 14, 2023

1 flaky test on run #14653 ↗︎

0 540 10 0 Flakiness 1

Details:

fix merge conflict
Project: Spruce Commit: 458c0493dc
Status: Passed Duration: 24:40 💡
Started: Dec 14, 2023 9:59 PM Ended: Dec 14, 2023 10:24 PM
Flakiness  cypress/integration/distroSettings/host_section.ts • 1 flaky test

View Output Video

Test Artifacts
host section > using legacy ssh > updates host fields Screenshots Video

Review all test suite changes for PR #2195 ↗︎

@ybrill ybrill merged commit 5e05f71 into main Dec 15, 2023
5 of 6 checks passed
@ybrill ybrill deleted the DEVPROD-1661_missing_element branch December 15, 2023 03:41
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants