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

fix: log mariadb console usage (backport #25366) #25377

Merged
merged 2 commits into from
Mar 12, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Mar 12, 2024

This is an automatic backport of pull request #25366 done by Mergify.
Cherry-pick of 2d75dbb has failed:

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

You are currently cherry-picking commit 2d75dbb598.
  (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)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   frappe/commands/utils.py

no changes added to commit (use "git add" and/or "git commit -a")

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


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 2d75dbb)

# Conflicts:
#	frappe/commands/utils.py
@mergify mergify bot requested a review from a team March 12, 2024 15:37
@mergify mergify bot added the conflicts label Mar 12, 2024
@mergify mergify bot requested review from ankush and removed request for a team March 12, 2024 15:37
@mergify mergify bot assigned ankush Mar 12, 2024
Copy link
Contributor Author

mergify bot commented Mar 12, 2024

Cherry-pick of 2d75dbb has failed:

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

You are currently cherry-picking commit 2d75dbb598.
  (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)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   frappe/commands/utils.py

no changes added to commit (use "git add" and/or "git commit -a")

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

@github-actions github-actions bot added the add-test-cases Add test case to validate fix or enhancement label Mar 12, 2024
@ankush ankush enabled auto-merge March 12, 2024 16:13
@ankush ankush merged commit 69c0d08 into version-15-hotfix Mar 12, 2024
18 checks passed
@ankush ankush deleted the mergify/bp/version-15-hotfix/pr-25366 branch March 12, 2024 16:29
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 15.18.0 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Apr 4, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
add-test-cases Add test case to validate fix or enhancement conflicts released
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants