Merge pull request #3786 from mjstapp/dplane_intf

author Donald Sharp <sharpd@cumulusnetworks.com>

Mon, 22 Apr 2019 19:29:02 +0000 (15:29 -0400)

committer GitHub <noreply@github.com>

Mon, 22 Apr 2019 19:29:02 +0000 (15:29 -0400)
author Donald Sharp <sharpd@cumulusnetworks.com>
Mon, 22 Apr 2019 19:29:02 +0000 (15:29 -0400)
committer GitHub <noreply@github.com>
Mon, 22 Apr 2019 19:29:02 +0000 (15:29 -0400)
diff --cc lib/if.c
Simple merge
diff --cc zebra/if_netlink.c
Simple merge
diff --cc zebra/interface.c
Simple merge
author	Donald Sharp <sharpd@cumulusnetworks.com>
	Mon, 22 Apr 2019 19:29:02 +0000 (15:29 -0400)
committer	GitHub <noreply@github.com>
	Mon, 22 Apr 2019 19:29:02 +0000 (15:29 -0400)
		1	2
lib/if.c	patch \|	diff1 \|	diff2 \|	blob \| history
zebra/if_netlink.c	patch \|	diff1 \|	diff2 \|	blob \| history
zebra/interface.c	patch \|	diff1 \|	diff2 \|	blob \| history