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.

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

[release-1.22] Fully remove public internet dependency on DNS tests #1076

Closed
istio-testing opened this issue May 20, 2024 · 3 comments
Closed
Assignees

Comments

@istio-testing
Copy link
Contributor

Manual cherrypick required.

#1075 failed to apply on top of branch "release-1.22":

Applying: Fully remove public internet dependency on DNS tests
Using index info to reconstruct a base tree...
M	src/telemetry.rs
Falling back to patching base and 3-way merge...
Auto-merging src/telemetry.rs
CONFLICT (content): Merge conflict in src/telemetry.rs
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Fully remove public internet dependency on DNS tests
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".

@howardjohn
Copy link
Member

blocked by #1073

@zirain
Copy link
Member

zirain commented May 22, 2024

approved #1073

@howardjohn
Copy link
Member

Oops, the blocker was approved not the cherrypick

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

3 participants