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: Unset advertised capabilities if capability is disabled (backport #15514) #15518

Closed
wants to merge 3 commits into from

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Mar 11, 2024

This is an automatic backport of pull request #15514 done by Mergify.
Cherry-pick of 77102e8 has failed:

On branch mergify/bp/dev/10.0/pr-15514
Your branch is up to date with 'origin/dev/10.0'.

You are currently cherry-picking commit 77102e853.
  (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_packet.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


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 using dynamic capabilities, do not forget to unset advertised capabilities.

Otherwise, it's kept as advertised.

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

# Conflicts:
#	bgpd/bgp_packet.c
…restart

If we enter `bgp graceful-restart-disable`, make sure we disable the capabilities.

Signed-off-by: Donatas Abraitis <[email protected]>
(cherry picked from commit 7875736)
Signed-off-by: Donatas Abraitis <[email protected]>
(cherry picked from commit fd613d1)
@mergify mergify bot added the conflicts label Mar 11, 2024
Copy link
Author

mergify bot commented Mar 11, 2024

Cherry-pick of 77102e8 has failed:

On branch mergify/bp/dev/10.0/pr-15514
Your branch is up to date with 'origin/dev/10.0'.

You are currently cherry-picking commit 77102e853.
  (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_packet.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
Copy link
Member

Created manual backport #15521, closing this.

@ton31337 ton31337 closed this Mar 11, 2024
@ton31337 ton31337 deleted the mergify/bp/dev/10.0/pr-15514 branch March 11, 2024 15:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant