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-1648 / 24.10 / Pd 1648 update encryption documentation (by DjP-iX) #3422

Merged
merged 4 commits into from
Jan 10, 2025

Conversation

bugclerk
Copy link
Contributor

@bugclerk bugclerk commented Jan 9, 2025

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

git cherry-pick -x 8b7d37ed836a8cdadcac07e584ea43368cf8d4c9
git cherry-pick -x d3055a2a108ae5f4971fbec325acbd7a907986fe
git cherry-pick -x 305f6040676f0d3f45d1e85b19574db4248da943
git cherry-pick -x 63e83cfc78cb925de4ecd2c69d30951adde4ed11
git cherry-pick -x 8ff8229c22e9045d7381abd1ad865ebc5f699962
git cherry-pick -x 5d6b75f5ff2ae8ed12a5db0dae1f95f297b9fe0e
git cherry-pick -x 154f1bb4fbb231164bc53e94ad9de5cfd5cda9df
git cherry-pick -x 52b3dd9151bd7fab96264b56545d5b406b67cdc2
git cherry-pick -x 739ed1279c3324855d51ffcb0d56eaf33227dbee
git cherry-pick -x 1c676dd69d0192a16a619dd55b546b9aae39fe44
git cherry-pick -x 6c36e8e6c2b12974dad5f80fb606086a5ab79c98
git cherry-pick -x 5745a8cac32fade59f46647dacbda75f40d540c7
git cherry-pick -x df3f77b45b403f2f4bb7783fcf5cdd04e15c4e4d
git cherry-pick -x 5af8428d2131de794d16cb618fcecf5f1a812f33

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 01e26aab1e2bfa3ee1e1ac099741e9749ce13199

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

(cherry picked from commit 95c09fc)
DjP-iX added 3 commits January 9, 2025 15:38
* Update EncryptionUISCALE.md

* Update EncryptionSCALE.md

* Update EncryptionSCALE.md

* Update _index.md

* Update EncryptionUISCALE.md

* Update PoolCreateWizardScreens.md

* Create EncryptionRootLevel.md

* Update EncryptionWarning.md

* Update DatasetsSCALE.md

* Update EncryptionSCALE.md

* Update CreatePoolWizard.md

* Update _index.md

* Update ZvolsScreensScale.md

* Update CreatePool.md

---------

Co-authored-by: linzibelle <[email protected]>
(cherry picked from commit 01e26aa)
@DjP-iX DjP-iX marked this pull request as ready for review January 9, 2025 20:42
@DjP-iX DjP-iX requested a review from a team as a code owner January 9, 2025 20:43
@linzi-ix linzi-ix merged commit d70989c into 24.10 Jan 10, 2025
3 checks passed
@linzi-ix linzi-ix deleted the PD-1648-24.10 branch January 10, 2025 13:26
@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 10, 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