Skip to content

Conversation

bugclerk
Copy link
Contributor

@bugclerk bugclerk commented Oct 3, 2025

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

git reset --hard HEAD~1
git cherry-pick -x bc11936e180a00f689c9ea338188a9a8b13e472f
git cherry-pick -x c320b9cb46dea784185dfe0602d406500c63ba4c
git cherry-pick -x 71693136cf444773846d2f883b9b5707a27eca5e
git cherry-pick -x 143f805a47b82d28d4531147c6dddc7bf67f68ed
git cherry-pick -x 46e5c0654d09ef18f11cddb9efc74666a211911f
git cherry-pick -x 9cb85bb3ccade3f74a665a7602c8b1267d1e6845
git cherry-pick -x 953506c6a3af0b3ad77633d0a1cd51bda1229b2e
git cherry-pick -x 64df63d75a50206d2aea0ea050f300729b3ae684
git cherry-pick -x e2cbdab57391759f5567bbce925871caaeede128
git cherry-pick -x 4f9503df0de899f3b1b4c51c6b26fa02ef575960
git cherry-pick -x f01758664a2c6d85e2eac81741f3c2487f4a89cb
git cherry-pick -x 04343c24fbca8273a68dc8a78847f0c506ee74e4
git cherry-pick -x 7bdc269d1574836d646e22abea5f1a4c745afdcf
git cherry-pick -x 0b799ca2bc966480712822af44116d41258487d6
git cherry-pick -x 63cd03d88e836e24b9cce1b1155e1e008df6f44f
git cherry-pick -x 307b9b2d955ad969908624c1232ac39fb2b750df
git cherry-pick -x 1dc5bb26a0cf6fd31311b52f3025deca119fee17

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 4c4a449532ce334a725fcd5c9f04bba4e535025f

This PR updates the replication UI ref and tutorials with new screenshots and descriptions, changed procedures related to UI changes. It creates new snippets and modifies the existing BasicReplicationProcess.md snippet.

Unused replication snippets will be deleted.

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

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.

2 participants