Merge pull request #11159 from maduri111/bgpd-orr

author Russ White <russ@riw.us>

Wed, 12 Oct 2022 13:30:36 +0000 (09:30 -0400)

committer GitHub <noreply@github.com>

Wed, 12 Oct 2022 13:30:36 +0000 (09:30 -0400)
author Russ White <russ@riw.us>
Wed, 12 Oct 2022 13:30:36 +0000 (09:30 -0400)
committer GitHub <noreply@github.com>
Wed, 12 Oct 2022 13:30:36 +0000 (09:30 -0400)
diff --cc bgpd/bgp_vty.c
Simple merge
diff --cc bgpd/bgp_zebra.c
Simple merge
diff --cc bgpd/bgpd.h
Simple merge
author	Russ White <russ@riw.us>
	Wed, 12 Oct 2022 13:30:36 +0000 (09:30 -0400)
committer	GitHub <noreply@github.com>
	Wed, 12 Oct 2022 13:30:36 +0000 (09:30 -0400)
		1	2
bgpd/bgp_vty.c	patch \|	diff1 \|	diff2 \|	blob \| history
bgpd/bgp_zebra.c	patch \|	diff1 \|	diff2 \|	blob \| history
bgpd/bgpd.h	patch \|	diff1 \|	diff2 \|	blob \| history