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

State compatible epoch speedup from v18 (backport #6161) #6235

Merged
merged 1 commit into from
Aug 29, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 29, 2023

This is an automatic backport of pull request #6161 done by Mergify.
Cherry-pick of 19c3c50 has failed:

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

You are currently cherry-picking commit 19c3c508.
  (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/incentives/keeper/distribute.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   CHANGELOG.md
	both modified:   x/superfluid/keeper/stake.go

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-6161 branch from 14d3ae3 to d16c709 Compare August 29, 2023 21:36
@p0mvn p0mvn merged commit 4ca6d82 into v19.x Aug 29, 2023
@p0mvn p0mvn deleted the mergify/bp/v19.x/pr-6161 branch August 29, 2023 21:51
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.

2 participants