Merge pull request #3762 from pguibert6WIND/do_not_alloc_lists_fs_by_def

author Lou Berger <lberger@labn.net>

Tue, 16 Apr 2019 15:24:48 +0000 (11:24 -0400)

committer GitHub <noreply@github.com>

Tue, 16 Apr 2019 15:24:48 +0000 (11:24 -0400)
author Lou Berger <lberger@labn.net>
Tue, 16 Apr 2019 15:24:48 +0000 (11:24 -0400)
committer GitHub <noreply@github.com>
Tue, 16 Apr 2019 15:24:48 +0000 (11:24 -0400)
diff --cc bgpd/bgp_route.c
Simple merge
diff --cc bgpd/bgp_zebra.c
Simple merge
author	Lou Berger <lberger@labn.net>
	Tue, 16 Apr 2019 15:24:48 +0000 (11:24 -0400)
committer	GitHub <noreply@github.com>
	Tue, 16 Apr 2019 15:24:48 +0000 (11:24 -0400)
		1	2
bgpd/bgp_route.c	patch \|	diff1 \|	diff2 \|	blob \| history
bgpd/bgp_zebra.c	patch \|	diff1 \|	diff2 \|	blob \| history