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

x/incentives: Lower Epoch allocation overhead (backport #7100) #7103

Merged
merged 5 commits into from
Dec 13, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Dec 12, 2023

This is an automatic backport of pull request #7100 done by Mergify.
Cherry-pick of 63d2551 has failed:

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

You are currently cherry-picking commit 63d2551b.
  (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
	modified:   x/incentives/keeper/iterator.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

* Lower allocation overhead

* Add changelog

(cherry picked from commit 63d2551)

# Conflicts:
#	CHANGELOG.md
@mergify mergify bot requested a review from a team as a code owner December 12, 2023 21:44
@github-actions github-actions bot added the T:CI label Dec 12, 2023
@ValarDragon ValarDragon merged commit f7c9600 into v20.x Dec 13, 2023
1 check passed
@ValarDragon ValarDragon deleted the mergify/bp/v20.x/pr-7100 branch December 13, 2023 00:47
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