Merge pull request #14867 from opensourcerouting/zclient-options-cleanup

author Donald Sharp <donaldsharp72@gmail.com>

Sat, 25 Nov 2023 14:15:07 +0000 (09:15 -0500)

committer GitHub <noreply@github.com>

Sat, 25 Nov 2023 14:15:07 +0000 (09:15 -0500)
author Donald Sharp <donaldsharp72@gmail.com>
Sat, 25 Nov 2023 14:15:07 +0000 (09:15 -0500)
committer GitHub <noreply@github.com>
Sat, 25 Nov 2023 14:15:07 +0000 (09:15 -0500)
diff --cc bgpd/bgp_zebra.c
Simple merge
diff --cc zebra/zapi_msg.c
Simple merge
author	Donald Sharp <donaldsharp72@gmail.com>
	Sat, 25 Nov 2023 14:15:07 +0000 (09:15 -0500)
committer	GitHub <noreply@github.com>
	Sat, 25 Nov 2023 14:15:07 +0000 (09:15 -0500)
		1	2
bgpd/bgp_zebra.c	patch \|	diff1 \|	diff2 \|	blob \| history
zebra/zapi_msg.c	patch \|	diff1 \|	diff2 \|	blob \| history