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

Remove the EndBlock ordering constraints, that didn't matter before (backport #1981) #2037

Merged
merged 3 commits into from
Jul 15, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jul 12, 2022

This is an automatic backport of pull request #1981 done by Mergify.
Cherry-pick of 28417c0 has failed:

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

You are currently cherry-picking commit 28417c0b.
  (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:   app/modules.go
	modified:   x/superfluid/module.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   x/superfluid/abci.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

…1981)

* Remove the EndBlock ordering constraints, that didn't matter before

* Remove unused superfluid end block logic

(cherry picked from commit 28417c0)

# Conflicts:
#	x/superfluid/abci.go
@mergify mergify bot requested a review from a team July 12, 2022 18:44
@mergify mergify bot added the conflicts label Jul 12, 2022
@ValarDragon
Copy link
Member

Re-running jobs, everything passes for me locally. Probably just some random github error I think

@ValarDragon ValarDragon merged commit f30b3f1 into v10.x Jul 15, 2022
@ValarDragon ValarDragon deleted the mergify/bp/v10.x/pr-1981 branch July 15, 2022 04:39
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.

1 participant