-
Notifications
You must be signed in to change notification settings - Fork 8k
Closed
Description
Manual cherrypick required.
#40220 failed to apply on top of branch "release-1.14":
Applying: Fix 0103 warning on pods on the host network
Using index info to reconstruct a base tree...
M pkg/config/analysis/analyzers/injection/injection.go
M pkg/config/analysis/analyzers/testdata/injection.yaml
Falling back to patching base and 3-way merge...
Auto-merging pkg/config/analysis/analyzers/testdata/injection.yaml
CONFLICT (content): Merge conflict in pkg/config/analysis/analyzers/testdata/injection.yaml
Auto-merging pkg/config/analysis/analyzers/injection/injection.go
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 0103 warning on pods on the host network
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
Metadata
Assignees
Labels
No labels