Skip to content

Conversation

@gwynnemonahan
Copy link
Contributor

@gwynnemonahan gwynnemonahan commented Jul 10, 2025

https://issues.redhat.com/browse/OSDOCS-15160 [NETOBSERV] Incorporate reviewer feedback rel notes

Version(s):
4.12, 4.14, 4.16+

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

Link to docs preview:

QE review:
QE review is not required for this change as these are editorial/style changes from previous cherry-picks and original integration PR for no-1.9.

CP: 95608
Original: 94440

Additional information:

@openshift-ci openshift-ci bot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Jul 10, 2025
@ocpdocs-previewbot
Copy link

ocpdocs-previewbot commented Jul 10, 2025

@gwynnemonahan
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 Jul 10, 2025
@mburke5678 mburke5678 added the peer-review-in-progress Signifies that the peer review team is reviewing this PR label Jul 10, 2025
@mburke5678
Copy link
Contributor

@gwynnemonahan A couple of nits. Otherwise LGTM

@mburke5678 mburke5678 added peer-review-done Signifies that the peer review team has reviewed this PR branch/enterprise-4.12 branch/enterprise-4.14 branch/enterprise-4.15 branch/enterprise-4.16 branch/enterprise-4.17 branch/enterprise-4.18 branch/enterprise-4.19 branch/enterprise-4.20 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 Jul 10, 2025
@mburke5678 mburke5678 added this to the Continuous Release milestone Jul 10, 2025
@mburke5678
Copy link
Contributor

@gwynnemonahan A couple of further nits. Otherwie LGTM. No CP to 4.13??

@gwynnemonahan
Copy link
Contributor Author

Hey @mburke5678 ,

Nope. No CP to 4.13 and no CP to 4.15.

@openshift-ci
Copy link

openshift-ci bot commented Jul 11, 2025

@gwynnemonahan: all tests passed!

Full PR test history. Your PR dashboard.

Details

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.

@gwynnemonahan
Copy link
Contributor Author

/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 Jul 11, 2025
@kcarmichael08 kcarmichael08 added merge-review-in-progress Signifies that the merge review team is reviewing this PR and removed merge-review-needed Signifies that the merge review team needs to review this PR labels Jul 11, 2025
@kcarmichael08 kcarmichael08 merged commit 40696da into openshift:main Jul 11, 2025
2 checks passed
@kcarmichael08
Copy link
Contributor

/cherrypick enterprise-4.12

@kcarmichael08
Copy link
Contributor

/cherrypick enterprise-4.14

@kcarmichael08
Copy link
Contributor

/cherrypick enterprise-4.16

@openshift-cherrypick-robot

@kcarmichael08: new pull request created: #96022

Details

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.

@kcarmichael08
Copy link
Contributor

/cherrypick enterprise-4.17

@openshift-cherrypick-robot

@kcarmichael08: new pull request created: #96023

Details

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.

@kcarmichael08
Copy link
Contributor

/cherrypick enterprise-4.18

@openshift-cherrypick-robot

@kcarmichael08: #95965 failed to apply on top of branch "enterprise-4.16":

Applying: OSDOCS-15160 [NETOBSERV] Incorporate reviewer feedback rel notes
Using index info to reconstruct a base tree...
M	observability/network_observability/network-observability-operator-release-notes.adoc
Falling back to patching base and 3-way merge...
Auto-merging observability/network_observability/network-observability-operator-release-notes.adoc
CONFLICT (content): Merge conflict in observability/network_observability/network-observability-operator-release-notes.adoc
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 OSDOCS-15160 [NETOBSERV] Incorporate reviewer feedback rel notes

Details

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.

@kcarmichael08
Copy link
Contributor

/cherrypick enterprise-4.19

@kcarmichael08
Copy link
Contributor

/cherrypick enterprise-4.20

@openshift-cherrypick-robot

@kcarmichael08: new pull request created: #96024

Details

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.

@openshift-cherrypick-robot

@kcarmichael08: #95965 failed to apply on top of branch "enterprise-4.18":

Patch is empty.
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To record the empty patch as an empty commit, run "git am --allow-empty".
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"

Details

In response to this:

/cherrypick enterprise-4.18

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

@kcarmichael08: new pull request created: #96025

Details

In response to this:

/cherrypick enterprise-4.19

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

@kcarmichael08: new pull request created: #96026

Details

In response to this:

/cherrypick enterprise-4.20

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.

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

Labels

branch/enterprise-4.12 branch/enterprise-4.14 branch/enterprise-4.15 branch/enterprise-4.16 branch/enterprise-4.17 branch/enterprise-4.18 branch/enterprise-4.19 branch/enterprise-4.20 merge-review-in-progress Signifies that the merge review team is reviewing this PR peer-review-done Signifies that the peer review team has reviewed this PR size/M Denotes a PR that changes 30-99 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants