Merge pull request #7748 from adrianomarto/bgp-listen-on-multiple-addresses

author Donatas Abraitis <donatas.abraitis@gmail.com>

Wed, 13 Jan 2021 06:57:38 +0000 (08:57 +0200)

committer GitHub <noreply@github.com>

Wed, 13 Jan 2021 06:57:38 +0000 (08:57 +0200)
author Donatas Abraitis <donatas.abraitis@gmail.com>
Wed, 13 Jan 2021 06:57:38 +0000 (08:57 +0200)
committer GitHub <noreply@github.com>
Wed, 13 Jan 2021 06:57:38 +0000 (08:57 +0200)
diff --cc bgpd/bgpd.c
Simple merge
diff --cc bgpd/bgpd.h
Simple merge
diff --cc doc/user/bgp.rst
Simple merge
author	Donatas Abraitis <donatas.abraitis@gmail.com>
	Wed, 13 Jan 2021 06:57:38 +0000 (08:57 +0200)
committer	GitHub <noreply@github.com>
	Wed, 13 Jan 2021 06:57:38 +0000 (08:57 +0200)
		1	2
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