Skip to content

[enterprise-4.19] Integration Branch: Rebased ok no 1.9#95560

Merged
kalexand-rh merged 6 commits intoopenshift:enterprise-4.19from
openshift-cherrypick-robot:cherry-pick-95556-to-enterprise-4.19
Jul 2, 2025
Merged

[enterprise-4.19] Integration Branch: Rebased ok no 1.9#95560
kalexand-rh merged 6 commits intoopenshift:enterprise-4.19from
openshift-cherrypick-robot:cherry-pick-95556-to-enterprise-4.19

Conversation

@openshift-cherrypick-robot
Copy link
Copy Markdown

This is an automated cherry-pick of #95556

/assign openshift-cherrypick-robot

/cherrypick enterprise-4.18 enterprise-4.17 enterprise-4.16 enterprise-4.14 enterprise-4.12

@openshift-ci openshift-ci Bot added the size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. label Jul 2, 2025
@openshift-ci
Copy link
Copy Markdown

openshift-ci Bot commented Jul 2, 2025

@openshift-cherrypick-robot: 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.

@kalexand-rh kalexand-rh merged commit 7658f55 into openshift:enterprise-4.19 Jul 2, 2025
2 checks passed
@openshift-cherrypick-robot
Copy link
Copy Markdown
Author

@openshift-cherrypick-robot: #95560 failed to apply on top of branch "enterprise-4.18":

Applying: OSDOCS-14786 Add section for IPsec
.git/rebase-apply/patch:582: new blank line at EOF.
+
warning: 1 line adds whitespace errors.
Using index info to reconstruct a base tree...
M	modules/network-observability-ebpf-rule-flow-filter.adoc
M	modules/network-observability-filtering-ebpf-rule.adoc
M	modules/network-observability-flowcollector-api-specifications.adoc
M	modules/network-observability-multitenancy.adoc
M	modules/network-observability-netobserv-cli-reference.adoc
M	observability/network_observability/configuring-operator.adoc
M	observability/network_observability/observing-network-traffic.adoc
Falling back to patching base and 3-way merge...
Auto-merging observability/network_observability/observing-network-traffic.adoc
CONFLICT (content): Merge conflict in observability/network_observability/observing-network-traffic.adoc
Auto-merging modules/network-observability-netobserv-cli-reference.adoc
CONFLICT (content): Merge conflict in modules/network-observability-netobserv-cli-reference.adoc
Auto-merging modules/network-observability-flowcollector-api-specifications.adoc
Auto-merging modules/network-observability-filtering-ebpf-rule.adoc
CONFLICT (content): Merge conflict in modules/network-observability-filtering-ebpf-rule.adoc
CONFLICT (add/add): Merge conflict in modules/network-observability-con_filter-network-flows-at-ingestion.adoc
Auto-merging modules/network-observability-con_filter-network-flows-at-ingestion.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-14786 Add section for IPsec

Details

In response to this:

This is an automated cherry-pick of #95556

/assign openshift-cherrypick-robot

/cherrypick enterprise-4.18 enterprise-4.17 enterprise-4.16 enterprise-4.14 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.

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

Labels

size/XL Denotes a PR that changes 500-999 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants