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

refactor: scheduler without external libraries (backport #18331) #21458

Merged
merged 2 commits into from
Jun 22, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jun 22, 2023

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

On branch mergify/bp/version-13-hotfix/pr-18331
Your branch is up to date with 'origin/version-13-hotfix'.

You are currently cherry-picking commit c3b547f897.
  (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:   frappe/utils/scheduler.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   pyproject.toml

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

(cherry picked from commit c3b547f)

# Conflicts:
#	pyproject.toml
@mergify mergify bot requested a review from a team June 22, 2023 10:01
@mergify mergify bot added the conflicts label Jun 22, 2023
@mergify mergify bot requested review from phot0n and removed request for a team June 22, 2023 10:01
@mergify mergify bot assigned ankush Jun 22, 2023
@ankush ankush force-pushed the mergify/bp/version-13-hotfix/pr-18331 branch from 9732684 to 6907a34 Compare June 22, 2023 10:11
@ankush ankush merged commit c28a453 into version-13-hotfix Jun 22, 2023
8 checks passed
@ankush ankush deleted the mergify/bp/version-13-hotfix/pr-18331 branch June 22, 2023 10:36
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 13.57.3 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Jul 15, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants