Merge pull request #1358 from opensourcerouting/isis-lsp_tick-fixes

author Donald Sharp <sharpd@cumulusnetworks.com>

Wed, 25 Oct 2017 13:19:06 +0000 (09:19 -0400)

committer GitHub <noreply@github.com>

Wed, 25 Oct 2017 13:19:06 +0000 (09:19 -0400)
author Donald Sharp <sharpd@cumulusnetworks.com>
Wed, 25 Oct 2017 13:19:06 +0000 (09:19 -0400)
committer GitHub <noreply@github.com>
Wed, 25 Oct 2017 13:19:06 +0000 (09:19 -0400)
diff --cc isisd/isis_circuit.c
Simple merge
diff --cc isisd/isis_lsp.c
Simple merge
diff --cc isisd/isis_pdu.c
Simple merge
author	Donald Sharp <sharpd@cumulusnetworks.com>
	Wed, 25 Oct 2017 13:19:06 +0000 (09:19 -0400)
committer	GitHub <noreply@github.com>
	Wed, 25 Oct 2017 13:19:06 +0000 (09:19 -0400)
		1	2
isisd/isis_circuit.c	patch \|	diff1 \|	diff2 \|	blob \| history
isisd/isis_lsp.c	patch \|	diff1 \|	diff2 \|	blob \| history
isisd/isis_pdu.c	patch \|	diff1 \|	diff2 \|	blob \| history