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-1651 / 24.04 / PD-1651-update-vm-migration (by linzi-ix) #3434

Draft
wants to merge 1 commit into
base: 24.04
Choose a base branch
from

Conversation

bugclerk
Copy link
Contributor

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

git reset --hard HEAD~1
git cherry-pick -x 75a8eeab57eb294eaa22b9f97923728fdadd745c
git cherry-pick -x de9b630b179ba267624b0d064b9004b3d42d9c60
git cherry-pick -x aac9c0c0715ddf4ea84f2b03a27341db03397192
git cherry-pick -x 78ef5f1102decccf90f76855f0f7591a3ecc308f

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 ee3a8dbfbeca6ddb8fa2fed41b66a3a19530f526

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: #3427
Jira URL: https://ixsystems.atlassian.net/browse/PD-1651

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