Merge pull request #3746 from ton31337/feature/rfc_8212

author David Lamparter <equinox@diac24.net>

Tue, 19 Feb 2019 12:54:23 +0000 (13:54 +0100)

committer GitHub <noreply@github.com>

Tue, 19 Feb 2019 12:54:23 +0000 (13:54 +0100)
author David Lamparter <equinox@diac24.net>
Tue, 19 Feb 2019 12:54:23 +0000 (13:54 +0100)
committer GitHub <noreply@github.com>
Tue, 19 Feb 2019 12:54:23 +0000 (13:54 +0100)
diff --cc bgpd/bgp_route.c
Simple merge
diff --cc bgpd/bgp_vty.c
Simple merge
diff --cc bgpd/bgpd.c
Simple merge
author	David Lamparter <equinox@diac24.net>
	Tue, 19 Feb 2019 12:54:23 +0000 (13:54 +0100)
committer	GitHub <noreply@github.com>
	Tue, 19 Feb 2019 12:54:23 +0000 (13:54 +0100)
		1	2
bgpd/bgp_route.c	patch \|	diff1 \|	diff2 \|	blob \| history
bgpd/bgp_vty.c	patch \|	diff1 \|	diff2 \|	blob \| history
bgpd/bgpd.c	patch \|	diff1 \|	diff2 \|	blob \| history