Merge pull request #9998 from pguibert6WIND/bgp_tcp_keepalive

author Donatas Abraitis <donatas@opensourcerouting.org>

Mon, 10 Oct 2022 12:46:30 +0000 (15:46 +0300)

committer GitHub <noreply@github.com>

Mon, 10 Oct 2022 12:46:30 +0000 (15:46 +0300)
author Donatas Abraitis <donatas@opensourcerouting.org>
Mon, 10 Oct 2022 12:46:30 +0000 (15:46 +0300)
committer GitHub <noreply@github.com>
Mon, 10 Oct 2022 12:46:30 +0000 (15:46 +0300)
diff --cc bgpd/bgp_vty.c
Simple merge
diff --cc bgpd/bgpd.c
Simple merge
diff --cc bgpd/bgpd.h
Simple merge
diff --cc doc/user/bgp.rst
Simple merge
diff --cc lib/sockopt.c
Simple merge
author	Donatas Abraitis <donatas@opensourcerouting.org>
	Mon, 10 Oct 2022 12:46:30 +0000 (15:46 +0300)
committer	GitHub <noreply@github.com>
	Mon, 10 Oct 2022 12:46:30 +0000 (15:46 +0300)
		1	2
bgpd/bgp_vty.c	patch \|	diff1 \|	diff2 \|	blob \| history
bgpd/bgpd.c	patch \|	diff1 \|	diff2 \|	blob \| history
bgpd/bgpd.h	patch \|	diff1 \|	diff2 \|	blob \| history
doc/user/bgp.rst	patch \|	diff1 \|	diff2 \|	blob \| history
lib/sockopt.c	patch \|	diff1 \|	diff2 \|	blob \| history