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-131338 / 24.10-RC.1 / Bring in non-free firmware for debian backports (by sonicaj) #726

Merged
merged 1 commit into from
Sep 20, 2024

Conversation

bugclerk
Copy link

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

git reset --hard HEAD~1
git cherry-pick -x 8e35a07b3af063e66ca45e97aec21dd5a1406b1f

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 2f97e32b3069346445e91d6f7f44d62c2a83cecd

Original PR: #725
Jira URL: https://ixsystems.atlassian.net/browse/NAS-131338

@sonicaj sonicaj marked this pull request as ready for review September 20, 2024 17:40
@yocalebo yocalebo merged commit 00a12c8 into release/24.10-RC.1 Sep 20, 2024
3 of 4 checks passed
@yocalebo yocalebo deleted the NAS-131338-24.10-RC.1 branch September 20, 2024 18:44
@bugclerk
Copy link
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 Sep 20, 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