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

build(deps): bump tendermint to v0.34.26 (backport #14911) #14913

Merged
merged 2 commits into from
Feb 5, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Feb 5, 2023

This is an automatic backport of pull request #14911 done by Mergify.
Cherry-pick of 04de093 has failed:

On branch mergify/bp/release/v0.45.x/pr-14911
Your branch is up to date with 'origin/release/v0.45.x'.

You are currently cherry-picking commit 04de09326.
  (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)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   CHANGELOG.md
	both modified:   go.mod
	both modified:   go.sum

no changes added to commit (use "git add" and/or "git commit -a")

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

(cherry picked from commit 04de093)

# Conflicts:
#	CHANGELOG.md
#	go.mod
#	go.sum
@mergify mergify bot added the conflicts label Feb 5, 2023
@mergify mergify bot mentioned this pull request Feb 5, 2023
19 tasks
@julienrbrt julienrbrt self-assigned this Feb 5, 2023
@julienrbrt julienrbrt removed their assignment Feb 5, 2023
@julienrbrt julienrbrt enabled auto-merge (squash) February 5, 2023 15:20
@julienrbrt julienrbrt merged commit 472729e into release/v0.45.x Feb 5, 2023
@julienrbrt julienrbrt deleted the mergify/bp/release/v0.45.x/pr-14911 branch February 5, 2023 15:23
@faddat faddat mentioned this pull request Mar 23, 2023
19 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant