Closed andyzhangx closed 2 months 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
/cherrypick release-1.24
/cherrypick release-1.23
/cherrypick release-1.22
@andyzhangx: #1381 failed to apply on top of branch "release-1.22":
Applying: fix: support storeAccountKey as true in cross subscription scenario
Using index info to reconstruct a base tree...
M docs/driver-parameters.md
M pkg/blob/controllerserver.go
M pkg/blob/controllerserver_test.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/blob/controllerserver_test.go
CONFLICT (content): Merge conflict in pkg/blob/controllerserver_test.go
Auto-merging pkg/blob/controllerserver.go
Auto-merging docs/driver-parameters.md
CONFLICT (content): Merge conflict in docs/driver-parameters.md
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: support storeAccountKey as true in cross subscription scenario
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".
@andyzhangx: new pull request created: #1382
@andyzhangx: new pull request created: #1383
What type of PR is this? /kind bug
What this PR does / why we need it: fix: support storeAccountKey as false in cross subscription scenario
Which issue(s) this PR fixes:
Fixes #
Requirements:
Special notes for your reviewer:
Release note: