Skip to content

refactor: make batcher configurable (backport #815) #818

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 2 commits into from
Aug 11, 2023
Merged

refactor: make batcher configurable (backport #815) #818

merged 2 commits into from
Aug 11, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 11, 2023

This is an automatic backport of pull request #815 done by Mergify.
Cherry-pick of 0420895 has failed:

On branch mergify/bp/release/v1.x.x/pr-815
Your branch is up to date with 'origin/release/v1.x.x'.

You are currently cherry-picking commit 0420895.
  (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:   batch.go
	modified:   batch_test.go
	modified:   benchmarks/bench_test.go
	modified:   immutable_tree.go
	modified:   iterator_test.go
	modified:   mutable_tree.go
	modified:   mutable_tree_test.go
	modified:   nodedb.go
	modified:   nodedb_test.go
	modified:   options.go
	modified:   proof_iavl_test.go
	modified:   testutils_test.go
	modified:   tree_random_test.go
	modified:   tree_test.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

@tac0turtle @mergify
refactor: make batcher configurable (#815)
67ae83e 
Co-authored-by: Marko Baricevic <marbar3778@yahoo.com>
Co-authored-by: Cool Developer <cool199966@outlook.com>
Co-authored-by: Julien Robert <julien@rbrt.fr>
(cherry picked from commit 0420895)

# Conflicts:
#	CHANGELOG.md
@mergify mergify bot requested a review from a team August 11, 2023 17:57
@mergify mergify bot added the conflicts label Aug 11, 2023
@mergify mergify bot mentioned this pull request Aug 11, 2023
Merged
@julienrbrt julienrbrt merged commit 4637357 into release/v1.x.x Aug 11, 2023
@julienrbrt julienrbrt deleted the mergify/bp/release/v1.x.x/pr-815 branch August 11, 2023 20:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
1 more reviewer

@julienrbrt julienrbrt julienrbrt approved these changes

Reviewers whose approvals may not affect merge requirements
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@julienrbrt @cool-develope @tac0turtle