Closed
Description
Manual cherrypick required.
#47704 failed to apply on top of branch "release-1.19":
Applying: Fix header present match
Applying: add release note
Applying: Add ut
Using index info to reconstruct a base tree...
M pilot/pkg/networking/core/v1alpha3/route/route_test.go
Falling back to patching base and 3-way merge...
Auto-merging pilot/pkg/networking/core/v1alpha3/route/route_test.go
CONFLICT (content): Merge conflict in pilot/pkg/networking/core/v1alpha3/route/route_test.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0003 Add ut
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".
Metadata
Assignees
Labels
No labels