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.4.x] Fix #647, fix #909 - Always parse delete object non-strict (backport #912) #913

Merged
merged 3 commits into from
Feb 26, 2024

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Feb 26, 2024

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

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

You are currently cherry-picking commit 3239354.
  (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:   irrd/updates/tests/test_handler.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   irrd/updates/parser.py

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

When an object is deleted, the submitted object's values are
ignored except for the primary key. Therefore, there's no
need to validate them in strict mode.
This also disables the rules validator for deletion objects, re #909

(cherry picked from commit 3239354)

# Conflicts:
#	irrd/updates/parser.py
(cherry picked from commit 7a046b2)
@mergify mergify bot added the conflicts label Feb 26, 2024
@mxsasha mxsasha merged commit 5a2d6c8 into stable/4.4.x Feb 26, 2024
7 checks passed
@mxsasha mxsasha deleted the mergify/bp/stable/4.4.x/pr-912 branch February 26, 2024 19:56
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