Skip to content

Conversation

@dhawton
Copy link
Member

@dhawton dhawton commented Oct 20, 2025

Description

Reviewers

  • Ambient
  • Docs
  • Installation
  • Networking
  • Performance and Scalability
  • Extensions and Telemetry
  • Security
  • Test and Release
  • User Experience
  • Developer Infrastructure
  • Localization/Translation

@dhawton dhawton requested a review from a team as a code owner October 20, 2025 14:28
@istio-testing istio-testing added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Oct 20, 2025
Signed-off-by: Daniel Hawton <[email protected]>
@istio-testing istio-testing merged commit a44535b into istio:master Oct 27, 2025
6 checks passed
@dhawton dhawton added the cherrypick/release-1.27 Set this label on a PR to auto-merge it to the release-1.27 branch label Oct 27, 2025
@dhawton
Copy link
Member Author

dhawton commented Oct 27, 2025

/cherry-pick release-1.27

@istio-testing
Copy link
Contributor

In response to a cherrypick label: #16942 failed to apply on top of branch "release-1.27":

Applying: fix sec adv
Using index info to reconstruct a base tree...
M	content/en/news/security/istio-security-2025-002/index.md
Falling back to patching base and 3-way merge...
Auto-merging content/en/news/security/istio-security-2025-002/index.md
CONFLICT (content): Merge conflict in content/en/news/security/istio-security-2025-002/index.md
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 fix sec adv

@istio-testing
Copy link
Contributor

In response to a cherrypick label: new issue created for failed cherrypick: #16950

@istio-testing
Copy link
Contributor

@dhawton: #16942 failed to apply on top of branch "release-1.27":

Applying: fix sec adv
Using index info to reconstruct a base tree...
M	content/en/news/security/istio-security-2025-002/index.md
Falling back to patching base and 3-way merge...
Auto-merging content/en/news/security/istio-security-2025-002/index.md
CONFLICT (content): Merge conflict in content/en/news/security/istio-security-2025-002/index.md
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 fix sec adv

In response to this:

/cherry-pick release-1.27

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.

@istio-testing
Copy link
Contributor

@dhawton: new issue created for failed cherrypick: #16951

In response to this:

/cherry-pick release-1.27

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

cherrypick/release-1.27 Set this label on a PR to auto-merge it to the release-1.27 branch kind/docs size/S Denotes a PR that changes 10-29 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants