Merge pull request #1059 from opensourcerouting/oldbits-1

author Donald Sharp <sharpd@cumulusnetworks.com>

Tue, 29 Aug 2017 23:53:30 +0000 (19:53 -0400)

committer GitHub <noreply@github.com>

Tue, 29 Aug 2017 23:53:30 +0000 (19:53 -0400)
author Donald Sharp <sharpd@cumulusnetworks.com>
Tue, 29 Aug 2017 23:53:30 +0000 (19:53 -0400)
committer GitHub <noreply@github.com>
Tue, 29 Aug 2017 23:53:30 +0000 (19:53 -0400)
diff --cc doc/Makefile.am
Simple merge
diff --cc zebra/connected.c
Simple merge
diff --cc zebra/interface.c
Simple merge
diff --cc zebra/kernel_socket.c
Simple merge
author	Donald Sharp <sharpd@cumulusnetworks.com>
	Tue, 29 Aug 2017 23:53:30 +0000 (19:53 -0400)
committer	GitHub <noreply@github.com>
	Tue, 29 Aug 2017 23:53:30 +0000 (19:53 -0400)
		1	2
doc/Makefile.am	patch \|	diff1 \|	diff2 \|	blob \| history
zebra/connected.c	patch \|	diff1 \|	diff2 \|	blob \| history
zebra/interface.c	patch \|	diff1 \|	diff2 \|	blob \| history
zebra/kernel_socket.c	patch \|	diff1 \|	diff2 \|	blob \| history