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

bgpd: Ignore RFC8212 for BGP Confederations (backport #16305) #16315

Closed
wants to merge 2 commits into from

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Jul 1, 2024

Closes #16304


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

ton31337 added 2 commits July 1, 2024 14:21
RFC 8212 should be restricted for eBGP peers.

Signed-off-by: Donatas Abraitis <[email protected]>
(cherry picked from commit fa2cc09)

# Conflicts:
#	bgpd/bgp_route.c
Signed-off-by: Donatas Abraitis <[email protected]>
(cherry picked from commit dd6a679)
@mergify mergify bot added the conflicts label Jul 1, 2024
Copy link
Author

mergify bot commented Jul 1, 2024

Cherry-pick of fa2cc09 has failed:

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

You are currently cherry-picking commit fa2cc09d45.
  (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:   bgpd/bgp_route.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

@frrbot frrbot bot added bgp tests Topotests, make check, etc labels Jul 1, 2024
@ton31337
Copy link
Member

ton31337 commented Jul 1, 2024

Created a manual backport here #16323, closing this.

@ton31337 ton31337 closed this Jul 1, 2024
@ton31337 ton31337 deleted the mergify/bp/stable/9.0/pr-16305 branch July 1, 2024 19:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bgp size/S stable/9.0 tests Topotests, make check, etc
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant