Closed XudongLiuHarold closed 2 months ago
/cherry-pick release-1.29
@XudongLiuHarold: once the present PR merges, I will cherry-pick it on top of release-1.29 in a new PR and assign it to you.
/lgtm /approve
[APPROVALNOTIFIER] This PR is APPROVED
This pull-request has been approved by: DanielXiao, XudongLiuHarold
The full list of commands accepted by this bot can be found here.
The pull request process is described here
@XudongLiuHarold: #1185 failed to apply on top of branch "release-1.29":
Applying: fix go static check
Using index info to reconstruct a base tree...
M pkg/cloudprovider/vsphereparavirtual/loadbalancer_test.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/cloudprovider/vsphereparavirtual/loadbalancer_test.go
CONFLICT (content): Merge conflict in pkg/cloudprovider/vsphereparavirtual/loadbalancer_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 0001 fix go static check
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".
What this PR does / why we need it:
Which issue this PR fixes (optional, in
fixes #<issue number>(, fixes #<issue_number>, ...)
format, will close that issue when PR gets merged): fixes #Special notes for your reviewer:
Release note: