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

feat: speedup epoch distribution, superfluid component (backport #2214) #2261

Merged
merged 3 commits into from
Aug 23, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jul 31, 2022

This is an automatic backport of pull request #2214 done by Mergify.
Cherry-pick of 3cdfbcc has failed:

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

You are currently cherry-picking commit 3cdfbccd.
  (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)

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

no changes added to commit (use "git add" and/or "git commit -a")

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

* Speedup epoch distribution, superfluid component

* changelog entries

* lint

Co-authored-by: Dev Ojha <dojha@berkeley.edu>
(cherry picked from commit 3cdfbcc)

# Conflicts:
#	CHANGELOG.md
#	x/incentives/keeper/distribute.go
@mergify mergify bot added the conflicts label Jul 31, 2022
@ValarDragon ValarDragon self-assigned this Jul 31, 2022
CHANGELOG.md Show resolved Hide resolved
@github-actions
Copy link
Contributor

This pull request has been automatically marked as stale because it has not had any recent activity. It will be closed if no further activity occurs. Thank you!

@ValarDragon ValarDragon merged commit feab082 into v8.x Aug 23, 2022
@ValarDragon ValarDragon deleted the mergify/bp/v8.x/pr-2214 branch August 23, 2022 00:35
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.

3 participants