Closed dependabot[bot] closed 4 months ago
Hi @dependabot[bot]. Thanks for your PR.
I'm waiting for a red-hat-storage member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test
on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.
Once the patch is verified, the new status will be reflected by the ok-to-test
label.
I understand the commands that are listed here.
[APPROVALNOTIFIER] This PR is APPROVED
This pull-request has been approved by: dependabot[bot], subhamkrai
The full list of commands accepted by this bot can be found here.
The pull request process is described here
/cherry-pick release-4.16
@subhamkrai: #61 failed to apply on top of branch "release-4.16":
Applying: build(deps): bump github.com/rook/rook in the github-dependencies group
Using index info to reconstruct a base tree...
M go.mod
M go.sum
Falling back to patching base and 3-way merge...
Auto-merging go.sum
CONFLICT (content): Merge conflict in go.sum
Auto-merging go.mod
CONFLICT (content): Merge conflict in go.mod
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 build(deps): bump github.com/rook/rook in the github-dependencies group
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".
Bumps the github-dependencies group with 1 update: github.com/rook/rook.
Updates
github.com/rook/rook
from 1.14.7 to 1.14.8Release notes
Sourced from github.com/rook/rook's releases.
Commits
35b3b9e
Merge pull request #14417 from travisn/release-1.14.861b19a2
build: update the release version to v1.14.8ef1859a
Merge pull request #14409 from rook/mergify/bp/release-1.14/pr-14408d1889fb
csi: update csi-addons repo linkaf459c9
Merge pull request #14392 from rook/mergify/bp/release-1.14/pr-14391e910215
build: update go-retryablehttp from 0.7.6 to 0.7.7e92e742
Merge pull request #14371 from rook/mergify/bp/release-1.14/pr-14367c8c51a2
Merge pull request #14378 from rook/mergify/bp/release-1.14/pr-143748a1a947
Merge pull request #14389 from rook/mergify/bp/release-1.14/pr-1434286a96f0
docs(fix): missing**
for bold textDependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting
@dependabot rebase
.Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show