Closed bernerhat closed 1 week ago
/hold
Continuation PR for #2680
- should #2680 be also in for this PR?
/lgtm
[APPROVALNOTIFIER] This PR is APPROVED
This pull-request has been approved by: bernerhat, nb-ohad
The full list of commands accepted by this bot can be found here.
The pull request process is described here
/unhold
/cherry-pick release-4.17
@ezio-auditore: #2733 failed to apply on top of branch "release-4.17":
Applying: added support for ocs provider server to fetch noobaa resources
Using index info to reconstruct a base tree...
M services/provider/server/consumer_test.go
M services/provider/server/server.go
M services/provider/server/server_test.go
Falling back to patching base and 3-way merge...
Auto-merging services/provider/server/server_test.go
CONFLICT (content): Merge conflict in services/provider/server/server_test.go
Auto-merging services/provider/server/server.go
Auto-merging services/provider/server/consumer_test.go
CONFLICT (content): Merge conflict in services/provider/server/consumer_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 added support for ocs provider server to fetch noobaa resources
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".
Continuation PR for #2680