Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

NAS-130629 / 24.10-RC.1 / Add "Reset" to configure dashboard (by denysbutenko) #10611

Merged
merged 2 commits into from
Sep 3, 2024

Conversation

bugclerk
Copy link
Contributor

@bugclerk bugclerk commented Sep 3, 2024

Automatic cherry-pick failed. Please resolve conflicts by running:

git cherry-pick -x aca2d5b8497578557099062f8948e22b9e788060
git cherry-pick -x f98048b1b4960c480865b75c8720cf02e42c91ae

If the original PR was merged via a squash, you can just cherry-pick the squashed commit:

git reset --hard HEAD~1
git cherry-pick -x e067aa97fae3a2f55869d3f76e0b75489bbd484c

Original PR: #10584
Jira URL: https://ixsystems.atlassian.net/browse/NAS-130629

@undsoft undsoft marked this pull request as ready for review September 3, 2024 10:08
@undsoft undsoft requested a review from a team as a code owner September 3, 2024 10:08
@undsoft undsoft requested review from AlexKarpov98 and removed request for a team September 3, 2024 10:08
Copy link
Collaborator

@undsoft undsoft left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

backported

@undsoft undsoft enabled auto-merge (squash) September 3, 2024 10:08
@undsoft undsoft merged commit 9d65d87 into stable/electriceel Sep 3, 2024
7 checks passed
@undsoft undsoft deleted the NAS-130629-24.10-RC.1 branch September 3, 2024 10:40
@bugclerk
Copy link
Contributor Author

bugclerk commented Sep 3, 2024

This PR has been merged and conversations have been locked.
If you would like to discuss more about this issue please use our forums or raise a Jira ticket.

@truenas truenas locked as resolved and limited conversation to collaborators Sep 3, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants