search

FRRouting / frr

The FRRouting Protocol Suite
https://frrouting.org/
Other
3.13k stars 1.21k forks source link

bgpd: Set last reset reason to admin shutdown if it was manually (backport #16242) #16277

Closed mergify[bot] closed 3 weeks ago

mergify[bot] commented 3 weeks ago

Closes https://github.com/FRRouting/frr/issues/16238

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

mergify[bot] commented 3 weeks ago

Cherry-pick of c25c7e929d550c2faca3af74a29593b8c0b75db3 has failed:

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

You are currently cherry-picking commit c25c7e929d.
  (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/bgpd.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 commented 3 weeks ago

Manual backport here https://github.com/FRRouting/frr/pull/16286, closing this.