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-1706 / 24.10 / PD-1706-document-new-cloud-backup-option (by linzi-ix) #3468

Merged
merged 4 commits into from
Jan 24, 2025

Conversation

bugclerk
Copy link
Contributor

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

git reset --hard HEAD~1
git cherry-pick -x 8f2393b9d1c690fc4851a0d9e90862dae5cdb181
git cherry-pick -x d682a8d63d36dbf4e2d84a2f939b92725ef10b74
git cherry-pick -x 5619a6deb8c009afb061d7cbdb36b72085c9363c
git cherry-pick -x 1df882eefae75accf2348d64be7eed0634a31e33
git cherry-pick -x adab171131e0a25c8f8193139a649a27a4e2a256

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 39b20a34686709072920b903d32b9e16b9a5a8b6

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

@linzi-ix linzi-ix marked this pull request as ready for review January 24, 2025 19:10
@linzi-ix linzi-ix requested a review from a team as a code owner January 24, 2025 19:10
@DjP-iX DjP-iX merged commit 3a87fea into 24.10 Jan 24, 2025
3 checks passed
@DjP-iX DjP-iX deleted the PD-1706-24.10 branch January 24, 2025 19:38
@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 24, 2025
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