Skip to content

perf: Make ResetBatch accumulate a minimum batch size (backport #729)#783

Closed
mergify[bot] wants to merge 2 commits intorelease/v0.21.xfrom
mergify/bp/release/v0.21.x/pr-729
Closed

perf: Make ResetBatch accumulate a minimum batch size (backport #729)#783
mergify[bot] wants to merge 2 commits intorelease/v0.21.xfrom
mergify/bp/release/v0.21.x/pr-729

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented May 30, 2023

This is an automatic backport of pull request #729 done by Mergify.
Cherry-pick of 747bc12 has failed:

On branch mergify/bp/release/v0.21.x/pr-729
Your branch is up to date with 'origin/release/v0.21.x'.

You are currently cherry-picking commit 747bc12.
  (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:   nodedb.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

Co-authored-by: Marko <marbar3778@yahoo.com>
(cherry picked from commit 747bc12)

# Conflicts:
#	CHANGELOG.md
@mergify mergify bot requested a review from a team May 30, 2023 09:00
@mergify mergify bot added the conflicts label May 30, 2023
@tac0turtle tac0turtle closed this Jul 18, 2023
@mergify mergify bot deleted the mergify/bp/release/v0.21.x/pr-729 branch July 18, 2023 13:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Development

Successfully merging this pull request may close these issues.

2 participants