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-1467 / 25.04 / Pd 1467 clarify storj bucket nuances (by DjP-iX) #3186

Merged
merged 13 commits into from
Nov 7, 2024

Conversation

bugclerk
Copy link
Contributor

@bugclerk bugclerk commented Nov 4, 2024

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

git cherry-pick -x 87a7a3409e2e1eac9849b4500465dc3a65980daf
git cherry-pick -x b7a66649ef75dbb165783397f3133c1a3f268298
git cherry-pick -x 72ad886023f62574b27c491c0dddea35884f838b
git cherry-pick -x d9ac34c7ab6b5d5626b6717eed8e60757b3dab9d
git cherry-pick -x 9c1662f1c2b3f42bfb552f46495cc9a9dcd5acec
git cherry-pick -x 9fc13a6c9c87c69258f3dc26742b60f83dce01df
git cherry-pick -x e8d8a527804a3ee74e8d281f1475e8b31e4aad19
git cherry-pick -x d154d3a120a5c4a680d6d5cec1841f3c73167e4b
git cherry-pick -x e3a294fdc3d672d1d5eb701711bc7f1977f8837c
git cherry-pick -x bbf46870db6c577e87db55953b69684809f733cb
git cherry-pick -x 88390aa113080d285363f54b743f9d14f905104d
git cherry-pick -x d432674e11b419c0d1a4bcc685da56a6d1175bea

If the original PR was merged via a squash, you can just cherry-pick the squashed commit:

git reset --hard HEAD~9
git cherry-pick -x 0928772f88ce32750e8d30c92be52bd56842f23f

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

(cherry picked from commit 0c82270)
(cherry picked from commit 484506d)
(cherry picked from commit 3fa3b53)
(cherry picked from commit 0635175)
(cherry picked from commit 89d679a)
(cherry picked from commit 7a686d9)
* Update TrueCloudTasks.md

* Update AddStorjCloudCredential.md

* Delete CreateStorjiXAccount.md

* Update SetUpStorjiXAccountS3Access.md

* Create StorjBucket.md

* Update TrueCloudTasks.md

* Create AddCloudSyncTaskNewBucket.png

* Create AddTrueCloudTaskNewBucket.png

* Update StorjBucket.md

* Update SetUpBackupScale.md

* Update AddCloudCredentials.md

* Update AddStorjCloudCredential.md

* Update CloudCredentialScreens.md

* Update CloudSyncTasksScreensSCALE.md

* Update CloudSyncTasksScreensSCALE.md

* Update AddCloudCredentials.md

* Update TrueCloudTasks.md

* Update TrueCloudBackupTasksScreen.md

* Update StorjBucket.md

---------

Co-authored-by: MicJ <92740932+micjohnson777@users.noreply.github.com>
(cherry picked from commit 0928772)
@DjP-iX DjP-iX marked this pull request as ready for review November 6, 2024 19:57
@DjP-iX DjP-iX requested a review from a team as a code owner November 6, 2024 19:57
@linzi-ix linzi-ix added the Technical Writer Review (LM) A technical writer is reviewing the PR. label Nov 7, 2024
@linzi-ix linzi-ix merged commit 52f24bb into master Nov 7, 2024
3 checks passed
@linzi-ix linzi-ix deleted the PD-1467-25.04 branch November 7, 2024 14:14
@bugclerk
Copy link
Contributor Author

bugclerk commented Nov 7, 2024

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 Nov 7, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Technical Writer Review (LM) A technical writer is reviewing the PR.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants