Merge pull request #2142 from pguibert6WIND/fs_zebra_complement

author Donald Sharp <sharpd@cumulusnetworks.com>

Tue, 29 May 2018 15:33:00 +0000 (11:33 -0400)

committer GitHub <noreply@github.com>

Tue, 29 May 2018 15:33:00 +0000 (11:33 -0400)
author Donald Sharp <sharpd@cumulusnetworks.com>
Tue, 29 May 2018 15:33:00 +0000 (11:33 -0400)
committer GitHub <noreply@github.com>
Tue, 29 May 2018 15:33:00 +0000 (11:33 -0400)
diff --cc bgpd/bgp_route.h
Simple merge
diff --cc zebra/rule_netlink.c
Simple merge
author	Donald Sharp <sharpd@cumulusnetworks.com>
	Tue, 29 May 2018 15:33:00 +0000 (11:33 -0400)
committer	GitHub <noreply@github.com>
	Tue, 29 May 2018 15:33:00 +0000 (11:33 -0400)
		1	2
bgpd/bgp_route.h	patch \|	diff1 \|	diff2 \|	blob \| history
zebra/rule_netlink.c	patch \|	diff1 \|	diff2 \|	blob \| history