mergify[bot]
commented
8 months ago Cherry-pick of c0307fa01678bcc8e71b4dd84b3e7ab1db52a994 has failed:
On branch mergify/bp/stable/4.4.x/pr-921
Your branch is up to date with 'origin/stable/4.4.x'.
You are currently cherry-picking commit c0307fa.
(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: docs/admins/availability-and-migration.rst
both modified: irrd/conf/__init__.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
The config would allow both of these to be set, even though the exporter would never run. It can't, because it stores the last export time.
This is an automatic backport of pull request #921 done by Mergify.