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

PD-1725 / 24.10 / PD-1725-wrong-image (by DjP-iX) #3430

Closed
wants to merge 3 commits into from

Conversation

bugclerk
Copy link
Contributor

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

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

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 d7baf48f1490de05ae7d5fd725d0d7b389f086ad

Thanks for contributing to TrueNAS documentation! By opening a Pull Request, you're acknowledging that your changes will be distributed under the Creative Commons 4.0 license.

Original PR: #3429
Jira URL: https://ixsystems.atlassian.net/browse/PD-1725

@DjP-iX
Copy link
Contributor

DjP-iX commented Jan 14, 2025

Not needed. The 24.10 branch used a different image for this that was already correct

@DjP-iX DjP-iX closed this Jan 14, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants