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

Merged
merged 2 commits into from
Jan 15, 2025

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

@linzi-ix linzi-ix marked this pull request as ready for review January 15, 2025 13:37
@linzi-ix linzi-ix requested a review from a team as a code owner January 15, 2025 13:37
@DjP-iX DjP-iX merged commit 20c71b9 into 23.10 Jan 15, 2025
3 checks passed
@DjP-iX DjP-iX deleted the PD-1651-23.10 branch January 15, 2025 13:53
@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 Jan 15, 2025
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.

3 participants