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.0: Apply cosmetic changes to unified scheduler (backport of #1861) #1873

Closed
wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Jun 26, 2024

Problem

Summary of Changes

Fixes #


This is an automatic backport of pull request #1861 done by [Mergify](https://mergify.com).

* Apply cosmetic changes to unified scheduler

* Use first instead of old-fashioned firstly

Co-authored-by: Andrew Fitzgerald <apfitzge@gmail.com>

---------

Co-authored-by: Andrew Fitzgerald <apfitzge@gmail.com>
(cherry picked from commit b8abc7e)

# Conflicts:
#	unified-scheduler-pool/src/lib.rs
@mergify mergify bot requested a review from a team as a code owner June 26, 2024 01:06
@mergify mergify bot added the conflicts label Jun 26, 2024
@mergify mergify bot assigned ryoqun Jun 26, 2024
Copy link
Author

mergify bot commented Jun 26, 2024

Cherry-pick of b8abc7e has failed:

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

You are currently cherry-picking commit b8abc7e3a5.
  (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:   runtime/src/installed_scheduler_pool.rs

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   unified-scheduler-pool/src/lib.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

@ryoqun ryoqun requested a review from apfitzge June 26, 2024 01:12
@ryoqun
Copy link
Member

ryoqun commented Jun 26, 2024

Cherry-pick of b8abc7e has failed:

oh, this is understandable, considering #1854 isn't merged yet...

@ryoqun ryoqun closed this Jun 26, 2024
@mergify mergify bot deleted the mergify/bp/v2.0/pr-1861 branch June 26, 2024 01:13
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