Skip to content

OSDOCS-19635 [NETOBSERV] Release notes 1.11.2#111350

Merged
bergerhoffer merged 1 commit into
openshift:mainfrom
gwynnemonahan:OSDOCS-19635
May 14, 2026
Merged

OSDOCS-19635 [NETOBSERV] Release notes 1.11.2#111350
bergerhoffer merged 1 commit into
openshift:mainfrom
gwynnemonahan:OSDOCS-19635

Conversation

@gwynnemonahan
Copy link
Copy Markdown
Contributor

@gwynnemonahan gwynnemonahan commented May 7, 2026 •
edited
Loading

@openshift-ci openshift-ci Bot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label May 7, 2026
@ocpdocs-previewbot
Copy link
Copy Markdown

ocpdocs-previewbot commented May 7, 2026 •
edited
Loading

🤖 Wed May 13 14:08:40 - Prow CI generated the docs preview:

https://111350--ocpdocs-pr.netlify.app/openshift-enterprise/latest/observability/network_observability/network-observability-operator-release-notes.html

@gwynnemonahan
Copy link
Copy Markdown
Contributor Author

gwynnemonahan commented May 13, 2026

Rebased 05/13/2026

@openshift-ci
Copy link
Copy Markdown

openshift-ci Bot commented May 13, 2026

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

@Amoghrd
Copy link
Copy Markdown

Amoghrd commented May 13, 2026

/label qe-approved

@openshift-ci openshift-ci Bot added the qe-approved Signifies that QE has signed off on this PR label May 13, 2026
@gwynnemonahan
Copy link
Copy Markdown
Contributor Author

gwynnemonahan commented May 13, 2026

/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 May 13, 2026
@bergerhoffer
Copy link
Copy Markdown
Contributor

bergerhoffer commented May 14, 2026

/label merge-review-in-progress

@openshift-ci openshift-ci Bot added the merge-review-in-progress Signifies that the merge review team is reviewing this PR label May 14, 2026
@bergerhoffer bergerhoffer added this to the Continuous Release milestone May 14, 2026
bergerhoffer
bergerhoffer reviewed May 14, 2026
View reviewed changes
Copy link
Copy Markdown
Contributor

@bergerhoffer bergerhoffer left a comment

Choose a reason for hiding this comment

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

LGTM!

@bergerhoffer bergerhoffer merged commit 14ff3bb into openshift:main May 14, 2026
2 checks passed
@bergerhoffer
Copy link
Copy Markdown
Contributor

bergerhoffer commented May 14, 2026

/cherrypick enterprise-4.22

@bergerhoffer
Copy link
Copy Markdown
Contributor

bergerhoffer commented May 14, 2026

/cherrypick enterprise-4.21

@bergerhoffer
Copy link
Copy Markdown
Contributor

bergerhoffer commented May 14, 2026

/cherrypick enterprise-4.20

@bergerhoffer
Copy link
Copy Markdown
Contributor

bergerhoffer commented May 14, 2026

/cherrypick enterprise-4.19

@bergerhoffer
Copy link
Copy Markdown
Contributor

bergerhoffer commented May 14, 2026

/cherrypick enterprise-4.18

@bergerhoffer
Copy link
Copy Markdown
Contributor

bergerhoffer commented May 14, 2026

/cherrypick enterprise-4.17

@bergerhoffer
Copy link
Copy Markdown
Contributor

bergerhoffer commented May 14, 2026

/cherrypick enterprise-4.16

@bergerhoffer
Copy link
Copy Markdown
Contributor

bergerhoffer commented May 14, 2026

/cherrypick enterprise-4.15

@bergerhoffer
Copy link
Copy Markdown
Contributor

bergerhoffer commented May 14, 2026

/cherrypick enterprise-4.14

@openshift-cherrypick-robot
Copy link
Copy Markdown

openshift-cherrypick-robot commented May 14, 2026

@bergerhoffer: new pull request created: #111664

Details

In response to this:

/cherrypick enterprise-4.22

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 May 14, 2026
Merged
@openshift-cherrypick-robot
Copy link
Copy Markdown

openshift-cherrypick-robot commented May 14, 2026

@bergerhoffer: new pull request created: #111665

Details

In response to this:

/cherrypick enterprise-4.21

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 May 14, 2026
Merged
@openshift-cherrypick-robot
Copy link
Copy Markdown

openshift-cherrypick-robot commented May 14, 2026

@bergerhoffer: new pull request created: #111666

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.

@openshift-cherrypick-robot openshift-cherrypick-robot mentioned this pull request May 14, 2026
Merged
@openshift-cherrypick-robot
Copy link
Copy Markdown

openshift-cherrypick-robot commented May 14, 2026

@bergerhoffer: new pull request created: #111667

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 openshift-cherrypick-robot mentioned this pull request May 14, 2026
Merged
@openshift-cherrypick-robot
Copy link
Copy Markdown

openshift-cherrypick-robot commented May 14, 2026

@bergerhoffer: #111350 failed to apply on top of branch "enterprise-4.17":

Applying: OSDOCS-19635 [NETOBSERV] Release notes 1.11.2
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 set advice.mergeConflict false"
Patch failed at 0001 OSDOCS-19635 [NETOBSERV] Release notes 1.11.2
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 openshift-cherrypick-robot mentioned this pull request May 14, 2026
Merged
@openshift-cherrypick-robot
Copy link
Copy Markdown

openshift-cherrypick-robot commented May 14, 2026

@bergerhoffer: new pull request created: #111668

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
Copy link
Copy Markdown

openshift-cherrypick-robot commented May 14, 2026

@bergerhoffer: new pull request created: #111669

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.

@openshift-cherrypick-robot
Copy link
Copy Markdown

openshift-cherrypick-robot commented May 14, 2026

@bergerhoffer: #111350 failed to apply on top of branch "enterprise-4.15":

Applying: OSDOCS-19635 [NETOBSERV] Release notes 1.11.2
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 set advice.mergeConflict false"
Patch failed at 0001 OSDOCS-19635 [NETOBSERV] Release notes 1.11.2
Details

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 May 14, 2026
Merged
@openshift-cherrypick-robot
Copy link
Copy Markdown

openshift-cherrypick-robot commented May 14, 2026

@bergerhoffer: #111350 failed to apply on top of branch "enterprise-4.14":

Applying: OSDOCS-19635 [NETOBSERV] Release notes 1.11.2
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 set advice.mergeConflict false"
Patch failed at 0001 OSDOCS-19635 [NETOBSERV] Release notes 1.11.2
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.

@bergerhoffer
Copy link
Copy Markdown
Contributor

bergerhoffer commented May 14, 2026

/cherrypick enterprise-4.15

@openshift-cherrypick-robot
Copy link
Copy Markdown

openshift-cherrypick-robot commented May 14, 2026

@bergerhoffer: #111350 failed to apply on top of branch "enterprise-4.15":

Applying: OSDOCS-19635 [NETOBSERV] Release notes 1.11.2
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 set advice.mergeConflict false"
Patch failed at 0001 OSDOCS-19635 [NETOBSERV] Release notes 1.11.2
Details

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.

@bergerhoffer
Copy link
Copy Markdown
Contributor

bergerhoffer commented May 14, 2026

@gwynnemonahan CPs to 4.17, 4.15 and 4.14 failed (though it's odd that 4.16 succeeded).

Can you do manual cherry picks for these versions please?

This was referenced May 14, 2026
Merged
Closed
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@bergerhoffer bergerhoffer bergerhoffer left review comments

Assignees

No one assigned

Labels

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 branch/enterprise-4.21 branch/enterprise-4.22 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 qe-approved Signifies that QE has signed off on this PR size/S Denotes a PR that changes 10-29 lines, ignoring generated files.

Projects

None yet

Milestone

Continuous Release

Development

Successfully merging this pull request may close these issues.

5 participants

@gwynnemonahan @ocpdocs-previewbot @Amoghrd @bergerhoffer @openshift-cherrypick-robot