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

chore: bump IAVL to v0.19.5 (backport #14889) #14891

Merged
merged 3 commits into from
Feb 2, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Feb 2, 2023

This is an automatic backport of pull request #14889 done by Mergify.
Cherry-pick of 21926ee has failed:

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

You are currently cherry-picking commit 21926ee78.
  (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/rm <file>..." as appropriate to mark resolution)
	both modified:   go.mod
	both modified:   go.sum
	deleted by us:   simapp/go.mod
	deleted by us:   simapp/go.sum
	deleted by us:   tests/go.mod
	deleted by us:   tests/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 21926ee)

# Conflicts:
#	go.mod
#	go.sum
#	simapp/go.mod
#	simapp/go.sum
#	tests/go.mod
#	tests/go.sum
@mergify mergify bot added the conflicts label Feb 2, 2023
@mergify mergify bot mentioned this pull request Feb 2, 2023
19 tasks
@julienrbrt julienrbrt self-assigned this Feb 2, 2023
@julienrbrt
Copy link
Member

Assigning myself this (ref #14889).
Preparing release notes and rc.

@@ -37,6 +37,8 @@ Ref: https://keepachangelog.com/en/1.0.0/

## [Unreleased]

## v0.45.13 - 2023-02-04
Copy link
Member

@julienrbrt julienrbrt Feb 2, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's not merge, until I get it was the intention to tag smth so short after. Otherwise I will simply delete this line.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Confirmed.

@julienrbrt julienrbrt merged commit d49269e into release/v0.45.x Feb 2, 2023
@julienrbrt julienrbrt deleted the mergify/bp/release/v0.45.x/pr-14889 branch February 2, 2023 18:06
@faddat faddat mentioned this pull request Mar 23, 2023
19 tasks
JeancarloBarrios pushed a commit to agoric-labs/cosmos-sdk that referenced this pull request Sep 28, 2024
Co-authored-by: Julien Robert <julien@rbrt.fr>
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