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

vtysh: Show ip ospf network ... even if it's not the same as the interface type (backport #15824) #15869

Closed
wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Apr 29, 2024


This is an automatic backport of pull request #15824 done by [Mergify](https://mergify.com).

…terface type

ospfv3 shows this unconditionally, and ospfv2 does not show `ip ospf network ...` if the type of the interface matches the specified network.

Fixes: #15817

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

# Conflicts:
#	ospfd/ospf_vty.c
@mergify mergify bot added the conflicts label Apr 29, 2024
Copy link
Author

mergify bot commented Apr 29, 2024

Cherry-pick of 1ce626a has failed:

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

You are currently cherry-picking commit 1ce626aea.
  (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:   ospfd/ospf_interface.c
	modified:   ospfd/ospf_interface.h

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   ospfd/ospf_vty.c

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

Manual backport created #15873.

@ton31337 ton31337 closed this Apr 29, 2024
@ton31337 ton31337 deleted the mergify/bp/stable/8.5/pr-15824 branch April 29, 2024 13:45
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.

1 participant