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

lib: fix distribute-list deletion (backport #16551) #16571

Closed
wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Aug 12, 2024

When a whole distribute-list is deleted (can be done only using API), all its children must be cleaned up manually.

Fixes #16538


This is an automatic backport of pull request #16551 done by Mergify.

When a whole distribute-list is deleted (can be done only using API),
all its children must be cleaned up manually.

Fixes #16538

Signed-off-by: Igor Ryzhov <[email protected]>
(cherry picked from commit 8fad4f3)

# Conflicts:
#	lib/distribute.c
@mergify mergify bot added the conflicts label Aug 12, 2024
Copy link
Author

mergify bot commented Aug 12, 2024

Cherry-pick of 8fad4f3 has failed:

On branch mergify/bp/stable/9.0/pr-16551
Your branch is up to date with 'origin/stable/9.0'.

You are currently cherry-picking commit 8fad4f317e.
  (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:   lib/distribute.c

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

@ton31337 ton31337 closed this Aug 12, 2024
@ton31337 ton31337 deleted the mergify/bp/stable/9.0/pr-16551 branch August 12, 2024 19:10
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.

2 participants