Closed mergify[bot] closed 1 week ago
Cherry-pick of 6afd56da969821359ee1fdfbfd33259587f58184 has failed:
On branch mergify/bp/stable/10.1/pr-17436
Your branch is up to date with 'origin/stable/10.1'.
You are currently cherry-picking commit 6afd56da96.
(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_asbr.c
modified: ospfd/ospf_asbr.h
modified: ospfd/ospf_lsa.c
modified: ospfd/ospf_vty.c
modified: ospfd/ospf_zebra.h
Unmerged paths:
(use "git add <file>..." to mark resolution)
both modified: ospfd/ospf_zebra.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
failure to merge, closing
When originating a default AS-External LSA in one OSPF instance, it wasn't working if the criteria route was installed by another OSPF instance. This required more flexible processing of the OSPF external route information.
This is an automatic backport of pull request #17436 done by Mergify.