Merge pull request #1034 from dwalton76/bgpd-mpls-fec-allocate

author David Lamparter <equinox@diac24.net>

Sun, 27 Aug 2017 17:18:58 +0000 (19:18 +0200)

committer GitHub <noreply@github.com>

Sun, 27 Aug 2017 17:18:58 +0000 (19:18 +0200)
author David Lamparter <equinox@diac24.net>
Sun, 27 Aug 2017 17:18:58 +0000 (19:18 +0200)
committer GitHub <noreply@github.com>
Sun, 27 Aug 2017 17:18:58 +0000 (19:18 +0200)
diff --cc bgpd/bgp_route.c
Simple merge
diff --cc bgpd/bgpd.c
Simple merge
author	David Lamparter <equinox@diac24.net>
	Sun, 27 Aug 2017 17:18:58 +0000 (19:18 +0200)
committer	GitHub <noreply@github.com>
	Sun, 27 Aug 2017 17:18:58 +0000 (19:18 +0200)
		1	2
bgpd/bgp_route.c	patch \|	diff1 \|	diff2 \|	blob \| history
bgpd/bgpd.c	patch \|	diff1 \|	diff2 \|	blob \| history