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.

Sign up for GitHub

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

Jump to bottom

OSDOCS#11823: Add an example command with an actual value in step 3 of the procedure #81065

Merged
merged 1 commit into from
Sep 6, 2024
Merged

OSDOCS#11823: Add an example command with an actual value in step 3 of the procedure #81065

merged 1 commit into from
Sep 6, 2024

Conversation

tmalove
Copy link
Contributor

@tmalove tmalove commented Aug 28, 2024 •
edited
Loading

Version(s):
4.12+

Issue:
OSDOCS-11823

Link to docs preview:
Step 3

QE review:

  • QE has approved this change.

Additional information:
This PR is a continuation of PR #80902 to add an example command that uses an actual value for the variable <node_name>.

@openshift-ci openshift-ci bot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Aug 28, 2024
@ocpdocs-previewbot
Copy link

🤖 Wed Aug 28 22:50:05 - Prow CI generated the docs preview:

https://81065--ocpdocs-pr.netlify.app/openshift-enterprise/latest/backup_and_restore/control_plane_backup_and_restore/replacing-unhealthy-etcd-member.html

@openshift-ci OpenShift CI
Copy link

openshift-ci bot commented Aug 28, 2024

@tmalove: all tests passed!

Full PR test history. Your PR dashboard.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here.

@tmalove
Copy link
Contributor Author

tmalove commented Aug 28, 2024

Hi @tjungblu and @geliu2016 This PR is related to PR #11775 that you reviewed yesterday. Per a peer review suggestion on that PR, I added an example command that uses an actual value for the <node_name>. Thanks!

@tjungblu
Copy link
Contributor

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Aug 29, 2024
@tmalove
Copy link
Contributor Author

tmalove commented Sep 4, 2024

Hi @geliu2016 Will you review this change? Thanks!

@geliu2016
Copy link

/lgtm

@tmalove
Copy link
Contributor Author

tmalove commented Sep 5, 2024

/label peer-review-needed

@openshift-ci openshift-ci bot added the peer-review-needed Signifies that the peer review team needs to review this PR label Sep 5, 2024
@adellape adellape self-assigned this Sep 5, 2024
@adellape adellape added the peer-review-in-progress Signifies that the peer review team is reviewing this PR label Sep 5, 2024
@adellape adellape added peer-review-done Signifies that the peer review team has reviewed this PR and removed peer-review-in-progress Signifies that the peer review team is reviewing this PR peer-review-needed Signifies that the peer review team needs to review this PR labels Sep 5, 2024
@adellape adellape added this to the Continuous Release milestone Sep 5, 2024
@tmalove
Copy link
Contributor Author

tmalove commented Sep 5, 2024

/label merge-review-needed

@openshift-ci openshift-ci bot added the merge-review-needed Signifies that the merge review team needs to review this PR label Sep 5, 2024
@jeana-redhat jeana-redhat added the merge-review-in-progress Signifies that the merge review team is reviewing this PR label Sep 6, 2024
jeana-redhat
jeana-redhat approved these changes Sep 6, 2024
View reviewed changes
Copy link
Contributor

@jeana-redhat jeana-redhat left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

/remove-label merge-review-in-progress
/remove-label merge-review-needed

@openshift-ci openshift-ci bot removed merge-review-in-progress Signifies that the merge review team is reviewing this PR merge-review-needed Signifies that the merge review team needs to review this PR labels Sep 6, 2024
@jeana-redhat jeana-redhat merged commit 57989b4 into openshift:main Sep 6, 2024
2 checks passed
@jeana-redhat
Copy link
Contributor

/cherrypick enterprise-4.17

@jeana-redhat
Copy link
Contributor

/cherrypick enterprise-4.16

@jeana-redhat
Copy link
Contributor

/cherrypick enterprise-4.15

@jeana-redhat
Copy link
Contributor

/cherrypick enterprise-4.14

@jeana-redhat
Copy link
Contributor

/cherrypick enterprise-4.13

@jeana-redhat
Copy link
Contributor

/cherrypick enterprise-4.12

@openshift-cherrypick-robot
Copy link

@jeana-redhat: new pull request created: #81412

In response to this:

/cherrypick enterprise-4.17

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

This was referenced Sep 6, 2024
Merged
Merged
@openshift-cherrypick-robot
Copy link

@jeana-redhat: new pull request created: #81413

In response to this:

/cherrypick enterprise-4.16

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@openshift-cherrypick-robot openshift-cherrypick-robot mentioned this pull request Sep 6, 2024
Merged
@openshift-cherrypick-robot
Copy link

@jeana-redhat: new pull request created: #81414

In response to this:

/cherrypick enterprise-4.15

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@openshift-cherrypick-robot openshift-cherrypick-robot mentioned this pull request Sep 6, 2024
Merged
@openshift-cherrypick-robot
Copy link

@jeana-redhat: new pull request created: #81415

In response to this:

/cherrypick enterprise-4.14

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@openshift-cherrypick-robot
Copy link

@jeana-redhat: new pull request created: #81416

In response to this:

/cherrypick enterprise-4.13

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@openshift-cherrypick-robot openshift-cherrypick-robot mentioned this pull request Sep 6, 2024
Merged
@openshift-cherrypick-robot
Copy link

@jeana-redhat: #81065 failed to apply on top of branch "enterprise-4.12":

Applying: Add an example command with an actual value
Using index info to reconstruct a base tree...
M	modules/restore-replace-stopped-etcd-member.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/restore-replace-stopped-etcd-member.adoc
CONFLICT (content): Merge conflict in modules/restore-replace-stopped-etcd-member.adoc
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Add an example command with an actual value
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherrypick enterprise-4.12

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@jeana-redhat
Copy link
Contributor

@tmalove looks like 4.12 needs a little hand-holding 😅

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jeana-redhat jeana-redhat jeana-redhat approved these changes

@adellape adellape adellape approved these changes

Assignees

@adellape adellape

@geliu2016 geliu2016

@tjungblu tjungblu

Labels
branch/enterprise-4.12 branch/enterprise-4.13 branch/enterprise-4.14 branch/enterprise-4.15 branch/enterprise-4.16 branch/enterprise-4.17 lgtm Indicates that a PR is ready to be merged. peer-review-done Signifies that the peer review team has reviewed this PR size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Milestone
Continuous Release
Development

Successfully merging this pull request may close these issues.
7 participants
@tmalove @ocpdocs-previewbot @tjungblu @geliu2016 @jeana-redhat @openshift-cherrypick-robot @adellape