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

Update wasmd to v0.24.0 (backport #1107) #1167

Closed
wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Mar 28, 2022

This is an automatic backport of pull request #1107 done by Mergify.
Cherry-pick of b688c4a has failed:

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

You are currently cherry-picking commit b688c4a.
  (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:   go.mod

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

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

* Update wasmd to v0.24.0

* Update changelog

(cherry picked from commit b688c4a)

# Conflicts:
#	CHANGELOG.md
#	go.sum
@mergify mergify bot added the conflicts label Mar 28, 2022
@p0mvn p0mvn requested review from ValarDragon and removed request for ValarDragon March 28, 2022 18:48
@p0mvn
Copy link
Member

p0mvn commented Mar 28, 2022

Looking into compile issues

@ValarDragon
Copy link
Member

This can't be backported, its state breaking

@mergify mergify bot deleted the mergify/bp/v7.x/pr-1107 branch March 28, 2022 19:04
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.

2 participants