Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

vendor: update dependencies (backport #2032) #2033

Closed
wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Jun 28, 2023

This is an automatic backport of pull request #2032 done by Mergify.
Cherry-pick of 16895ef has failed:

On branch mergify/bp/v1.5.x/pr-2032
Your branch is up to date with 'origin/v1.5.x'.

You are currently cherry-picking commit 16895efa.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   vendor/github.com/longhorn/backupstore/config.go
	modified:   vendor/github.com/longhorn/backupstore/deltablock.go
	modified:   vendor/github.com/longhorn/backupstore/lock.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   go.mod
	both modified:   go.sum
	both modified:   vendor/modules.txt

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

Signed-off-by: Derek Su <derek.su@suse.com>
(cherry picked from commit 16895ef)

# Conflicts:
#	go.mod
#	go.sum
#	vendor/modules.txt
@mergify mergify bot requested a review from a team as a code owner June 28, 2023 04:01
@mergify mergify bot added the conflicts label Jun 28, 2023
@mergify mergify bot mentioned this pull request Jun 28, 2023
@derekbit
Copy link
Member

Use #2034 instead

@derekbit derekbit closed this Jun 28, 2023
@mergify mergify bot deleted the mergify/bp/v1.5.x/pr-2032 branch June 28, 2023 04:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant