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-133020 / 25.04 / Remove nvidia leftovers (by themylogin) #15184

Merged
merged 1 commit into from
Dec 12, 2024

Conversation

bugclerk
Copy link
Contributor

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

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

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 a0e98d2bd43065077da8fc44527f38497d3bf0d2

Original PR: #15179
Jira URL: https://ixsystems.atlassian.net/browse/NAS-133020

(cherry picked from commit be04dff)
@themylogin themylogin marked this pull request as ready for review December 12, 2024 07:43
@themylogin themylogin merged commit d34a174 into master Dec 12, 2024
2 checks passed
@themylogin themylogin deleted the NAS-133020-25.04 branch December 12, 2024 07:43
@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 Dec 12, 2024
@themylogin
Copy link
Contributor

time 0:30

@bugclerk
Copy link
Contributor Author

Time tracking added.

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