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

cleanup: rename WaitUntilTimeout func #1298

Merged

Conversation

andyzhangx
Copy link
Member

What type of PR is this?
/kind cleanup

What this PR does / why we need it:
cleanup: rename WaitUntilTimeout func

Which issue(s) this PR fixes:

Fixes #

Requirements:

Special notes for your reviewer:

Release note:

none

@k8s-ci-robot k8s-ci-robot added kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Mar 19, 2024
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: andyzhangx

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot requested a review from cvvz March 19, 2024 07:33
@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Mar 19, 2024
@k8s-ci-robot k8s-ci-robot requested a review from feiskyer March 19, 2024 07:33
@k8s-ci-robot k8s-ci-robot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Mar 19, 2024
@andyzhangx andyzhangx merged commit d0cd4d4 into kubernetes-sigs:master Mar 19, 2024
20 of 21 checks passed
@andyzhangx
Copy link
Member Author

/cherrypick release-1.24

@andyzhangx
Copy link
Member Author

/cherrypick release-1.23

@k8s-infra-cherrypick-robot

@andyzhangx: new pull request created: #1299

In response to this:

/cherrypick release-1.24

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@k8s-infra-cherrypick-robot

@andyzhangx: #1298 failed to apply on top of branch "release-1.23":

Applying: cleanup: rename WaitUntilTimeout func
Using index info to reconstruct a base tree...
M	pkg/blob/controllerserver.go
M	pkg/blob/nodeserver.go
M	pkg/util/util.go
M	pkg/util/util_test.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/util/util_test.go
CONFLICT (content): Merge conflict in pkg/util/util_test.go
Auto-merging pkg/util/util.go
CONFLICT (content): Merge conflict in pkg/util/util.go
Auto-merging pkg/blob/nodeserver.go
CONFLICT (content): Merge conflict in pkg/blob/nodeserver.go
Auto-merging pkg/blob/controllerserver.go
CONFLICT (content): Merge conflict in pkg/blob/controllerserver.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 cleanup: rename WaitUntilTimeout func
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".

In response to this:

/cherrypick release-1.23

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants