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

v2.1: Revert "Report ConsumeWorkerMetrics at slot transitions (#3212)" (backport of #4667) #4699

Open
wants to merge 1 commit into
base: v2.1
Choose a base branch
from

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Jan 30, 2025

This reverts commit 415a78a.

Problem

@mergify mergify bot added the conflicts label Jan 30, 2025
@mergify mergify bot requested a review from a team as a code owner January 30, 2025 04:22
Copy link
Author

mergify bot commented Jan 30, 2025

Cherry-pick of c83075b has failed:

On branch mergify/bp/v2.1/pr-4667
Your branch is up to date with 'origin/v2.1'.

You are currently cherry-picking commit c83075b27.
  (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:   core/src/banking_stage/transaction_scheduler/scheduler_controller.rs

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   core/src/banking_stage/consume_worker.rs

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@apfitzge apfitzge force-pushed the mergify/bp/v2.1/pr-4667 branch from 5b1294b to 51ff043 Compare January 30, 2025 15:18
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