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-1569 / 13.0 / Pd 1569 re investigate and refresh disk replace procedures (by DjP-iX) #3298

Merged
merged 5 commits into from
Nov 26, 2024

Conversation

bugclerk
Copy link
Contributor

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

git reset --hard HEAD~1
git cherry-pick -x da8ba5222c4609074eb6aa09ba9c703c6c42a273
git cherry-pick -x fb810136a828b94972fce524701c69ac0531a1e6
git cherry-pick -x 2fceb823a4ab00e4e9ed75be53ff46eda05350bc
git cherry-pick -x 0939103afd3f041376ce91897359dda8eda75097
git cherry-pick -x 4052dd7e1d61053d99a2ced4ce3b5cc060bdb050
git cherry-pick -x 8b1206a0f4dfb2b9cfb2f59f459157538437c34f
git cherry-pick -x ce535475ce011f8d0f544aa576402c7f9c57f640
git cherry-pick -x 6eeccfc97add8ad91f0d00fb9886e16bbb298d4a
git cherry-pick -x 0ce6354af489f9bdef029dc846dbde96dc5ae4f8
git cherry-pick -x 56a76e62b7bc256e1d0059719d46ce7387b57289
git cherry-pick -x 3b218319d0aed5f4453b5d259853cf3dc335f43a
git cherry-pick -x 1ad19153685c7941771654824106d9cd86e456fa
git cherry-pick -x 48a3bb4c1810ad691338563872fac182d2db9bb2

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 fc1839be026f25703cb9113511985a9d6cae228a

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

…edures (#3286)

* Update DiskReplace.md

* Create HotSpareVdev.md

* Update _index.md

* Update DiskReplace.md

* Create AddVdevsScreenHotSpare.png

* Create StoragePoolsStatusHotSpareActive.png

* Update DiskReplace.md

* Update _index.md

* Delete HotSpareVdev.md

* Update _index.md

* Apply suggestions from code review

Co-authored-by: MicJ <[email protected]>

---------

Co-authored-by: MicJ <[email protected]>
(cherry picked from commit fc1839b)
@DjP-iX DjP-iX marked this pull request as ready for review November 26, 2024 18:49
@DjP-iX DjP-iX requested a review from a team as a code owner November 26, 2024 18:49
@micjohnson777 micjohnson777 merged commit 9cc5287 into 13.0 Nov 26, 2024
3 checks passed
@micjohnson777 micjohnson777 deleted the PD-1569-13.0 branch November 26, 2024 20:59
@micjohnson777 micjohnson777 added the Technical Writer Review (MJ) A technical writer is reviewing the PR. label Nov 26, 2024
@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 Nov 26, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Technical Writer Review (MJ) A technical writer is reviewing the PR.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants