Merge pull request #257 from opensourcerouting/nhrpd

author Donald Sharp <sharpd@cumulusnetworks.com>

Tue, 7 Mar 2017 20:15:23 +0000 (15:15 -0500)

committer GitHub <noreply@github.com>

Tue, 7 Mar 2017 20:15:23 +0000 (15:15 -0500)
author Donald Sharp <sharpd@cumulusnetworks.com>
Tue, 7 Mar 2017 20:15:23 +0000 (15:15 -0500)
committer GitHub <noreply@github.com>
Tue, 7 Mar 2017 20:15:23 +0000 (15:15 -0500)
diff --cc lib/log.c
Simple merge
diff --cc lib/log.h
Simple merge
diff --cc zebra/zebra_rnh.c
Simple merge
author	Donald Sharp <sharpd@cumulusnetworks.com>
	Tue, 7 Mar 2017 20:15:23 +0000 (15:15 -0500)
committer	GitHub <noreply@github.com>
	Tue, 7 Mar 2017 20:15:23 +0000 (15:15 -0500)
		1	2
lib/log.c	patch \|	diff1 \|	diff2 \|	blob \| history
lib/log.h	patch \|	diff1 \|	diff2 \|	blob \| history
zebra/zebra_rnh.c	patch \|	diff1 \|	diff2 \|	blob \| history