Merge pull request #998 from mkanjari/dev-master

author David Lamparter <equinox@diac24.net>

Tue, 29 Aug 2017 18:03:48 +0000 (20:03 +0200)

committer GitHub <noreply@github.com>

Tue, 29 Aug 2017 18:03:48 +0000 (20:03 +0200)
author David Lamparter <equinox@diac24.net>
Tue, 29 Aug 2017 18:03:48 +0000 (20:03 +0200)
committer GitHub <noreply@github.com>
Tue, 29 Aug 2017 18:03:48 +0000 (20:03 +0200)
diff --cc isisd/isis_lsp.c
Simple merge
diff --cc zebra/rt_netlink.c
Simple merge
author	David Lamparter <equinox@diac24.net>
	Tue, 29 Aug 2017 18:03:48 +0000 (20:03 +0200)
committer	GitHub <noreply@github.com>
	Tue, 29 Aug 2017 18:03:48 +0000 (20:03 +0200)
		1	2
isisd/isis_lsp.c	patch \|	diff1 \|	diff2 \|	blob \| history
zebra/rt_netlink.c	patch \|	diff1 \|	diff2 \|	blob \| history