Merge pull request #4314 from lkrishnamoor/extract_tunnel_type_extcom

author Donald Sharp <sharpd@cumulusnetworks.com>

Wed, 15 May 2019 00:18:29 +0000 (20:18 -0400)

committer GitHub <noreply@github.com>

Wed, 15 May 2019 00:18:29 +0000 (20:18 -0400)
author Donald Sharp <sharpd@cumulusnetworks.com>
Wed, 15 May 2019 00:18:29 +0000 (20:18 -0400)
committer GitHub <noreply@github.com>
Wed, 15 May 2019 00:18:29 +0000 (20:18 -0400)
diff --cc bgpd/bgp_attr.c
Simple merge
diff --cc bgpd/bgp_attr.h
Simple merge
author	Donald Sharp <sharpd@cumulusnetworks.com>
	Wed, 15 May 2019 00:18:29 +0000 (20:18 -0400)
committer	GitHub <noreply@github.com>
	Wed, 15 May 2019 00:18:29 +0000 (20:18 -0400)
		1	2
bgpd/bgp_attr.c	patch \|	diff1 \|	diff2 \|	blob \| history
bgpd/bgp_attr.h	patch \|	diff1 \|	diff2 \|	blob \| history