Merge pull request #1031 from opensourcerouting/small-bits

author Donald Sharp <sharpd@cumulusnetworks.com>

Thu, 24 Aug 2017 12:58:46 +0000 (08:58 -0400)

committer GitHub <noreply@github.com>

Thu, 24 Aug 2017 12:58:46 +0000 (08:58 -0400)
author Donald Sharp <sharpd@cumulusnetworks.com>
Thu, 24 Aug 2017 12:58:46 +0000 (08:58 -0400)
committer GitHub <noreply@github.com>
Thu, 24 Aug 2017 12:58:46 +0000 (08:58 -0400)
diff --cc bgpd/bgp_route.c
Simple merge
diff --cc lib/log.c
Simple merge
author	Donald Sharp <sharpd@cumulusnetworks.com>
	Thu, 24 Aug 2017 12:58:46 +0000 (08:58 -0400)
committer	GitHub <noreply@github.com>
	Thu, 24 Aug 2017 12:58:46 +0000 (08:58 -0400)
		1	2
bgpd/bgp_route.c	patch \|	diff1 \|	diff2 \|	blob \| history
lib/log.c	patch \|	diff1 \|	diff2 \|	blob \| history