Merge pull request #520 from opensourcerouting/bgpd-fixes-master

author Donald Sharp <sharpd@cumulusnetworks.com>

Mon, 15 May 2017 14:01:39 +0000 (10:01 -0400)

committer GitHub <noreply@github.com>

Mon, 15 May 2017 14:01:39 +0000 (10:01 -0400)
author Donald Sharp <sharpd@cumulusnetworks.com>
Mon, 15 May 2017 14:01:39 +0000 (10:01 -0400)
committer GitHub <noreply@github.com>
Mon, 15 May 2017 14:01:39 +0000 (10:01 -0400)
diff --cc bgpd/bgp_attr.c
Simple merge
diff --cc bgpd/bgp_updgrp_packet.c
Simple merge
author	Donald Sharp <sharpd@cumulusnetworks.com>
	Mon, 15 May 2017 14:01:39 +0000 (10:01 -0400)
committer	GitHub <noreply@github.com>
	Mon, 15 May 2017 14:01:39 +0000 (10:01 -0400)
		1	2
bgpd/bgp_attr.c	patch \|	diff1 \|	diff2 \|	blob \| history
bgpd/bgp_updgrp_packet.c	patch \|	diff1 \|	diff2 \|	blob \| history