Merge pull request #12795 from pguibert6WIND/vpnv6_nexthop_encoding

author Russ White <russ@riw.us>

Tue, 21 Feb 2023 13:15:43 +0000 (08:15 -0500)

committer GitHub <noreply@github.com>

Tue, 21 Feb 2023 13:15:43 +0000 (08:15 -0500)
author Russ White <russ@riw.us>
Tue, 21 Feb 2023 13:15:43 +0000 (08:15 -0500)
committer GitHub <noreply@github.com>
Tue, 21 Feb 2023 13:15:43 +0000 (08:15 -0500)
diff --cc bgpd/bgp_attr.c
Simple merge
diff --cc bgpd/bgp_routemap.c
Simple merge
author	Russ White <russ@riw.us>
	Tue, 21 Feb 2023 13:15:43 +0000 (08:15 -0500)
committer	GitHub <noreply@github.com>
	Tue, 21 Feb 2023 13:15:43 +0000 (08:15 -0500)
		1	2
bgpd/bgp_attr.c	patch \|	diff1 \|	diff2 \|	blob \| history
bgpd/bgp_routemap.c	patch \|	diff1 \|	diff2 \|	blob \| history