Closed andyzhangx closed 2 weeks ago
[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
/retest
/retest
/cherrypick release-1.30
/cherrypick release-1.29
/cherrypick release-1.28
@andyzhangx: new pull request created: #1941
@andyzhangx: new pull request created: #1942
@andyzhangx: #1940 failed to apply on top of branch "release-1.28":
Applying: fix: allow more cache hit in GetRemoteServerFromTarget on hpc deployment
Using index info to reconstruct a base tree...
M pkg/os/smb/smb.go
M pkg/util/util.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/util/util.go
CONFLICT (content): Merge conflict in pkg/util/util.go
Auto-merging pkg/os/smb/smb.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: allow more cache hit in GetRemoteServerFromTarget on hpc deployment
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".
/cherrypick release-1.28
@andyzhangx: #1940 failed to apply on top of branch "release-1.28":
Applying: fix: allow more cache hit in GetRemoteServerFromTarget on hpc deployment
Using index info to reconstruct a base tree...
M pkg/os/smb/smb.go
M pkg/util/util.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/util/util.go
CONFLICT (content): Merge conflict in pkg/util/util.go
Auto-merging pkg/os/smb/smb.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: allow more cache hit in GetRemoteServerFromTarget on hpc deployment
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 type of PR is this? /kind feature
What this PR does / why we need it: fix: allow more cache hit in GetRemoteServerFromTarget on hpc deployment
Which issue(s) this PR fixes:
Fixes #
Requirements:
Special notes for your reviewer:
Release note: