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:support tcp-mss for neighbor group (backport #17341) #17389

Closed
wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Nov 8, 2024

support tcp-mss for neighbor group


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

Signed-off-by: hanyu.zly <[email protected]>
(cherry picked from commit 9fa56a0)

# Conflicts:
#	bgpd/bgpd.c
#	tests/topotests/bgp_tcp_mss/test_bgp_tcp_mss.py
Copy link
Author

mergify bot commented Nov 8, 2024

Cherry-pick of 9fa56a0 has failed:

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

You are currently cherry-picking commit 9fa56a03c7.
  (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:   bgpd/bgp_vty.c
	modified:   tests/topotests/bgp_tcp_mss/r1/bgpd.conf
	modified:   tests/topotests/bgp_tcp_mss/r1/zebra.conf
	modified:   tests/topotests/bgp_tcp_mss/r2/bgpd.conf
	modified:   tests/topotests/bgp_tcp_mss/r2/zebra.conf

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   bgpd/bgpd.c
	both modified:   tests/topotests/bgp_tcp_mss/test_bgp_tcp_mss.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 mergify bot added the conflicts label Nov 8, 2024
@frrbot frrbot bot added the bgp label Nov 8, 2024
@ton31337 ton31337 closed this Nov 8, 2024
@ton31337 ton31337 deleted the mergify/bp/stable/10.0/pr-17341 branch November 8, 2024 07:17
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