Skip to content

Conversation

cvvz
Copy link
Member

@cvvz cvvz commented Apr 25, 2023

What type of PR is this?

What this PR does / why we need it:

Which issue(s) this PR fixes:

Fixes #

Requirements:

Special notes for your reviewer:

Release note:

none

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Apr 25, 2023
@andyzhangx andyzhangx changed the title fix: trim duplicated spaces fix: mount failure when mountOptions is empty Apr 26, 2023
Copy link
Member

@andyzhangx andyzhangx left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm
/kind bug

@k8s-ci-robot k8s-ci-robot added the kind/bug Categorizes issue or PR as related to a bug. label Apr 26, 2023
@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Apr 26, 2023
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: andyzhangx, cvvz

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 added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Apr 26, 2023
@k8s-ci-robot k8s-ci-robot merged commit 45b573f into kubernetes-sigs:master Apr 26, 2023
@andyzhangx
Copy link
Member

/cherrypick release-1.21

@andyzhangx
Copy link
Member

/cherrypick release-1.20

@andyzhangx
Copy link
Member

/cherrypick release-1.19

@k8s-infra-cherrypick-robot

@andyzhangx: cannot checkout release-1.21: error checking out release-1.21: exit status 1. output: error: pathspec 'release-1.21' did not match any file(s) known to git

In response to this:

/cherrypick release-1.21

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: #893 failed to apply on top of branch "release-1.20":

Applying: fix: trim duplicated spaces
Using index info to reconstruct a base tree...
M	pkg/blob/nodeserver.go
M	pkg/blobfuse-proxy/server/server.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/blobfuse-proxy/server/server.go
CONFLICT (content): Merge conflict in pkg/blobfuse-proxy/server/server.go
Auto-merging pkg/blob/nodeserver.go
CONFLICT (content): Merge conflict in pkg/blob/nodeserver.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: trim duplicated spaces
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.20

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: new pull request created: #895

In response to this:

/cherrypick release-1.19

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.

@andyzhangx
Copy link
Member

/cherrypick release-1.21

@k8s-infra-cherrypick-robot

@andyzhangx: new pull request created: #896

In response to this:

/cherrypick release-1.21

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.

@andyzhangx
Copy link
Member

/cherrypick release-1.20

@k8s-infra-cherrypick-robot

@andyzhangx: #893 failed to apply on top of branch "release-1.20":

Applying: fix: trim duplicated spaces
Using index info to reconstruct a base tree...
M	pkg/blob/nodeserver.go
M	pkg/blobfuse-proxy/server/server.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/blobfuse-proxy/server/server.go
CONFLICT (content): Merge conflict in pkg/blobfuse-proxy/server/server.go
Auto-merging pkg/blob/nodeserver.go
CONFLICT (content): Merge conflict in pkg/blob/nodeserver.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: trim duplicated spaces
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.20

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/bug Categorizes issue or PR as related to a bug. lgtm "Looks good to me", indicates that a PR is ready to be merged. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants