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

[4.2.x] Ref #697 - Add traceback logging on SIGUSR1 (backport #721) #728

Merged
merged 1 commit into from
Jan 6, 2023

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Jan 6, 2023

This is an automatic backport of pull request #721 done by Mergify.
Cherry-pick of 466849a has failed:

On branch mergify/bp/stable/4.2.x/pr-721
Your branch is up to date with 'origin/stable/4.2.x'.

You are currently cherry-picking commit 466849a.
  (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:   docs/admins/deployment.rst
	modified:   irrd/daemon/main.py
	modified:   irrd/utils/process_support.py

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   docs/releases/4.3.0.rst
	both modified:   irrd/server/http/app.py

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

@mergify mergify bot added the conflicts label Jan 6, 2023
@mergify mergify bot assigned mxsasha Jan 6, 2023
@mxsasha mxsasha force-pushed the mergify/bp/stable/4.2.x/pr-721 branch from 3e31510 to 77a13a5 Compare January 6, 2023 18:51
@mxsasha mxsasha merged commit 4b103eb into stable/4.2.x Jan 6, 2023
@mxsasha mxsasha deleted the mergify/bp/stable/4.2.x/pr-721 branch January 6, 2023 20:36
mxsasha added a commit that referenced this pull request Jan 6, 2023
(cherry picked from commit 466849a)

Co-authored-by: Sasha Romijn <github@mxsasha.eu>
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