Skip to content

Fix typo in PSAP section for NFD operator #79781

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

Merged
merged 1 commit into from
Aug 14, 2024

Conversation

GroceryBoyJr
Copy link
Contributor

@GroceryBoyJr GroceryBoyJr commented Jul 31, 2024

Version(s): 4.13+

Issue: https://issues.redhat.com/browse/OSDOCS-11669

Link to docs preview: https://79781--ocpdocs-pr.netlify.app/openshift-enterprise/latest/hardware_enablement/psap-node-feature-discovery-operator.html

QE review:

  • [*] QE has approved this change.

Additional information: Principal and Sr SW Engs approved. ContentX_24 improvement.

@openshift-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jul 31, 2024
@openshift-ci openshift-ci bot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Jul 31, 2024
@ocpdocs-previewbot
Copy link

ocpdocs-previewbot commented Jul 31, 2024

@openshift-merge-robot openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jul 31, 2024
@GroceryBoyJr
Copy link
Contributor Author

@liqcui your qe approval desired (or your designate, please)

@GroceryBoyJr
Copy link
Contributor Author

/assign @liqcui
/assign @chr15p

@GroceryBoyJr
Copy link
Contributor Author

@chr15p looking for your sme LGTM on this correction to the docs for getting NFD to install correctly.

@GroceryBoyJr GroceryBoyJr force-pushed the psap-nfd branch 2 times, most recently from fc06eeb to a60a4ee Compare July 31, 2024 18:40
@GroceryBoyJr
Copy link
Contributor Author

/assign @ggordaniRed your qe-approval requested please.

@GroceryBoyJr
Copy link
Contributor Author

/assign @dry923 your SME review desired, please.

Copy link

@dry923 dry923 left a comment

Choose a reason for hiding this comment

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

LGTM

Copy link
Member

@gryf gryf left a comment

Choose a reason for hiding this comment

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

/lgtm

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

/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 Aug 6, 2024
@gwynnemonahan
Copy link
Contributor

/label peer-review-in-progress

@openshift-ci openshift-ci bot added the peer-review-in-progress Signifies that the peer review team is reviewing this PR label Aug 6, 2024
Copy link
Contributor

@gwynnemonahan gwynnemonahan left a comment

Choose a reason for hiding this comment

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

Hey @GroceryBoyJr ,

LGTM.

@gwynnemonahan
Copy link
Contributor

/remove-label peer-review-in-progress
/remove-label peer-review-needed
/label peer-review-done

@openshift-ci openshift-ci bot 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 Aug 6, 2024
@ggordaniRed
Copy link

/lgtm

@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Aug 14, 2024
Copy link

openshift-ci bot commented Aug 14, 2024

New changes are detected. LGTM label has been removed.

Copy link

openshift-ci bot commented Aug 14, 2024

@GroceryBoyJr: 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.

@GroceryBoyJr
Copy link
Contributor Author

/label merge-review-needed

@ShaunaDiaz ShaunaDiaz added this to the Continuous Release milestone Aug 14, 2024
@ShaunaDiaz ShaunaDiaz merged commit 8941376 into openshift:main Aug 14, 2024
2 checks passed
@ShaunaDiaz
Copy link
Contributor

/cherrypick enterprise-4.13

@ShaunaDiaz
Copy link
Contributor

/cherrypick enterprise-4.14

@ShaunaDiaz
Copy link
Contributor

/cherrypick enterprise-4.15

@ShaunaDiaz
Copy link
Contributor

/cherrypick enterprise-4.16

@ShaunaDiaz
Copy link
Contributor

/cherrypick enterprise-4.17

@openshift-cherrypick-robot

@ShaunaDiaz: #79781 failed to apply on top of branch "enterprise-4.13":

Applying: fix typo in psap section for NFD operator
Using index info to reconstruct a base tree...
M	modules/creating-nfd-cr-cli.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/creating-nfd-cr-cli.adoc
CONFLICT (content): Merge conflict in modules/creating-nfd-cr-cli.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 fix typo in psap section for NFD operator
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.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

@ShaunaDiaz: new pull request created: #80499

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

@ShaunaDiaz: new pull request created: #80500

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

@ShaunaDiaz: new pull request created: #80501

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

@ShaunaDiaz: new pull request created: #80502

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.

@ShaunaDiaz
Copy link
Contributor

One sour cherry needs special treatment, @GroceryBoyJr #79781 (comment). LMK when ready and I can merge it up for you.

@GroceryBoyJr
Copy link
Contributor Author

@ShaunaDiaz sunnuva biscuit! :-D :-D :-D Looking at it now.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
branch/enterprise-4.13 branch/enterprise-4.14 branch/enterprise-4.15 branch/enterprise-4.16 branch/enterprise-4.17 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
Development

Successfully merging this pull request may close these issues.