Merge pull request #104 from opensourcerouting/time-cleanup

author Donald Sharp <sharpd@cumulusnetworks.com>

Tue, 24 Jan 2017 16:43:32 +0000 (11:43 -0500)

committer GitHub <noreply@github.com>

Tue, 24 Jan 2017 16:43:32 +0000 (11:43 -0500)
author Donald Sharp <sharpd@cumulusnetworks.com>
Tue, 24 Jan 2017 16:43:32 +0000 (11:43 -0500)
committer GitHub <noreply@github.com>
Tue, 24 Jan 2017 16:43:32 +0000 (11:43 -0500)
diff --cc bgpd/bgp_packet.c
Simple merge
diff --cc bgpd/bgpd.c
Simple merge
diff --cc lib/log.c
Simple merge
diff --cc zebra/zebra_fpm.c
Simple merge
diff --cc zebra/zserv.c
Simple merge
author	Donald Sharp <sharpd@cumulusnetworks.com>
	Tue, 24 Jan 2017 16:43:32 +0000 (11:43 -0500)
committer	GitHub <noreply@github.com>
	Tue, 24 Jan 2017 16:43:32 +0000 (11:43 -0500)
		1	2
bgpd/bgp_packet.c	patch \|	diff1 \|	diff2 \|	blob \| history
bgpd/bgpd.c	patch \|	diff1 \|	diff2 \|	blob \| history
lib/log.c	patch \|	diff1 \|	diff2 \|	blob \| history
zebra/zebra_fpm.c	patch \|	diff1 \|	diff2 \|	blob \| history
zebra/zserv.c	patch \|	diff1 \|	diff2 \|	blob \| history