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

fix(poolincentives): band-aid state export fix for cwpool gauges (backport #6476) #6479

Merged
merged 1 commit into from
Sep 22, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Sep 21, 2023

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

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

You are currently cherry-picking commit 6979794b.
  (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:   x/pool-incentives/keeper/genesis.go

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

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

@p0mvn p0mvn force-pushed the mergify/bp/v19.x/pr-6476 branch from 09ee2ea to bef37f9 Compare September 21, 2023 17:33
@p0mvn p0mvn merged commit 5978736 into v19.x Sep 22, 2023
1 check passed
@p0mvn p0mvn deleted the mergify/bp/v19.x/pr-6476 branch September 22, 2023 12:41
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