Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Fix tcpdump ports #15632

Merged
merged 1 commit into from
Aug 30, 2024
Merged

Fix tcpdump ports #15632

merged 1 commit into from
Aug 30, 2024

Conversation

sridhargaddam
Copy link
Contributor

The document captures HBONE port twice instead of application port.

@sridhargaddam
Fix tcpdump ports
d2ebbac 
The document captures HBONE port twice instead of application port.

Signed-off-by: Sridhar Gaddam <[email protected]>
@sridhargaddam sridhargaddam requested review from a team as code owners August 29, 2024 18:56
@istio-testing istio-testing added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Aug 29, 2024
@kfaseela kfaseela added the cherrypick/release-1.23 Set this label on a PR to auto-merge it to the release-1.23 branch label Aug 30, 2024
@istio-testing istio-testing merged commit 284b896 into istio:master Aug 30, 2024
6 checks passed
@istio-testing
Copy link
Contributor

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

Applying: Fix tcpdump ports
Using index info to reconstruct a base tree...
M	content/en/docs/ambient/usage/verify-mtls-enabled/index.md
A	content/zh/docs/ambient/usage/verify-mtls-enabled/index.md
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): content/zh/docs/ambient/usage/verify-mtls-enabled/index.md deleted in HEAD and modified in Fix tcpdump ports. Version Fix tcpdump ports of content/zh/docs/ambient/usage/verify-mtls-enabled/index.md left in tree.
Auto-merging content/en/docs/ambient/usage/verify-mtls-enabled/index.md
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 tcpdump ports
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".

@istio-testing istio-testing mentioned this pull request Aug 30, 2024
Open
@istio-testing
Copy link
Contributor

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

sridhargaddam added a commit to sridhargaddam/istio.io that referenced this pull request Aug 30, 2024
@sridhargaddam
Fix tcpdump ports (istio#15632)
168f2ce 
The document captures HBONE port twice instead of application port.

Signed-off-by: Sridhar Gaddam <[email protected]>
(cherry picked from commit 284b896)
istio-testing pushed a commit that referenced this pull request Aug 30, 2024
@sridhargaddam
Fix tcpdump ports (#15632) (#15634)
b3ccf6a 
The document captures HBONE port twice instead of application port.

Signed-off-by: Sridhar Gaddam <[email protected]>
(cherry picked from commit 284b896)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kfaseela kfaseela kfaseela approved these changes

Assignees
No one assigned
Labels
cherrypick/release-1.23 Set this label on a PR to auto-merge it to the release-1.23 branch size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@sridhargaddam @istio-testing @kfaseela