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: fix unconfigure asdot neighbor (backport #17582) #17593

Closed
wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Dec 5, 2024

The below command is not successfull on an existing as dot peer

no neighbor 10.0.0.2 remote-as 1.1
% Create the peer-group or interface first

Handle the case where the remote-as argument can be an ASNUM.

Fixes: 8079a41 ("lib, bgp: add initial support for asdot format")


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

The below command is not successfull on an existing as dot peer

> no neighbor 10.0.0.2 remote-as 1.1
> % Create the peer-group or interface first

Handle the case where the remote-as argument can be an ASNUM.

Fixes: 8079a41 ("lib, bgp: add initial support for asdot format")
Signed-off-by: Philippe Guibert <philippe.guibert@6wind.com>
(cherry picked from commit 12a9ca4)

# Conflicts:
#	bgpd/bgp_vty.c
@mergify mergify bot added the conflicts label Dec 5, 2024
Copy link
Author

mergify bot commented Dec 5, 2024

Cherry-pick of 12a9ca4 has failed:

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

You are currently cherry-picking commit 12a9ca4de6.
  (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_vty.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

ton31337 commented Dec 5, 2024

Replaced by #17597.

@ton31337 ton31337 closed this Dec 5, 2024
@ton31337 ton31337 deleted the mergify/bp/stable/9.1/pr-17582 branch December 5, 2024 07:42
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