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

upgrade iavl to v0.17.3-osmo-v5 with concurrent map write fix (backport #1061) #1062

Merged
merged 2 commits into from
Mar 9, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Mar 9, 2022

This is an automatic backport of pull request #1061 done by Mergify.
Cherry-pick of 6e21725 has failed:

On branch mergify/bp/v7.x/pr-1061
Your branch is up to date with 'origin/v7.x'.

You are currently cherry-picking commit 6e21725.
  (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:   CHANGELOG.md
	modified:   go.sum

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

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 6e21725)

# Conflicts:
#	go.mod
@mergify mergify bot added the conflicts label Mar 9, 2022
@codecov-commenter
Copy link

codecov-commenter commented Mar 9, 2022

Codecov Report

Merging #1062 (f850873) into v7.x (e13cddc) will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff           @@
##             v7.x    #1062   +/-   ##
=======================================
  Coverage   20.61%   20.61%           
=======================================
  Files         193      193           
  Lines       25243    25243           
=======================================
  Hits         5203     5203           
  Misses      19086    19086           
  Partials      954      954           

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update e13cddc...f850873. Read the comment docs.

@ValarDragon ValarDragon merged commit e4a68a2 into v7.x Mar 9, 2022
@ValarDragon ValarDragon deleted the mergify/bp/v7.x/pr-1061 branch March 9, 2022 20:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

3 participants