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-134059 / 25.04-RC.1 / Add roles to enclosure2 and update plugins (by creatorcary) #15692

Merged
merged 7 commits into from
Feb 13, 2025

Conversation

bugclerk
Copy link
Contributor

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

git reset --hard HEAD~1
git cherry-pick -x c7d036052ce0134d7cbab3da01559848493a2f67
git cherry-pick -x 5588642b40d1cb53287585886dc15464f4d0b672
git cherry-pick -x ee4b79fbf86cf4bda6ee00a158bc4073233b00f7
git cherry-pick -x 40ff3e45715621fe2e5ad2c177d4d7486506b1a9

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 74afc9a1cf25b1e803db2e870c7e8658da1b9823

http://jenkins.eng.ixsystems.net:8080/job/tests/job/api_tests/3017/

Original PR: #15659
Jira URL: https://ixsystems.atlassian.net/browse/NAS-134059

(cherry picked from commit c7d0360)
(cherry picked from commit 5588642)
(cherry picked from commit ee4b79f)
(cherry picked from commit 40ff3e4)
@creatorcary creatorcary force-pushed the NAS-134059-25.04-RC.1 branch from ae20270 to 6b731eb Compare February 13, 2025 15:09
@creatorcary creatorcary marked this pull request as ready for review February 13, 2025 16:08
@yocalebo yocalebo merged commit 16a5e21 into stable/fangtooth Feb 13, 2025
1 check passed
@yocalebo yocalebo deleted the NAS-134059-25.04-RC.1 branch February 13, 2025 16:25
@bugclerk
Copy link
Contributor Author

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 Feb 13, 2025
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