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-1613 / 24.10 / Pd 1613 update truecloud backup article content (by micjohnson777) #3401

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

Conversation

bugclerk
Copy link
Contributor

@bugclerk bugclerk commented Jan 2, 2025

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

git cherry-pick -x 4fa39e666b8d3e1fc69786a92e6ffed0c4676cbb
git cherry-pick -x c8082985bdf92609f54e54c55ff687caef4919d0
git cherry-pick -x 63cb1d296bdf995c2e6612d39eb6f8dd37214b2c
git cherry-pick -x 48c1430f6355bb0613e2e8e41315d294e7a989fd
git cherry-pick -x 0ba358364c939fdbc8eea817495c37533e7f1e37
git cherry-pick -x 5df21ad2f94cda9172f1d7ed482354ae4cdd026f
git cherry-pick -x 953a909e9b2e78dee87cf58b30936e91abffe545
git cherry-pick -x 1f5646bceb0150d9954099460a1c079ad3a30efe

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 b8e145c76c882289795746aa3829f1b5756ea7af

This PR includes the committed changes for PD-1661.

It updates the content in the CloudSyncTaskScreensSCALE.md and TrueCloudBackupTaskScreen.md files with new screenshots and/or content.
It updates the TrueCloudTasks.md article and StorjBucket.md snippet content and screenshots.

This PR can backport to 24.10

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

This has been disabled pending a rework.

(cherry picked from commit 9289726)
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.

3 participants