Merge remote-tracking 'frr/master' into SR-Routing

author Olivier Dugeon <olivier.dugeon@orange.com>

Tue, 30 Jan 2018 10:43:25 +0000 (11:43 +0100)

committer Olivier Dugeon <olivier.dugeon@orange.com>

Tue, 30 Jan 2018 10:43:25 +0000 (11:43 +0100)
author Olivier Dugeon <olivier.dugeon@orange.com>
Tue, 30 Jan 2018 10:43:25 +0000 (11:43 +0100)
committer Olivier Dugeon <olivier.dugeon@orange.com>
Tue, 30 Jan 2018 10:43:25 +0000 (11:43 +0100)
diff --cc doc/ospfd.texi
Simple merge
diff --cc lib/mpls.h
Simple merge
diff --cc ospfd/ospf_opaque.c
Simple merge
diff --cc ospfd/ospfd.c
Simple merge
author	Olivier Dugeon <olivier.dugeon@orange.com>
	Tue, 30 Jan 2018 10:43:25 +0000 (11:43 +0100)
committer	Olivier Dugeon <olivier.dugeon@orange.com>
	Tue, 30 Jan 2018 10:43:25 +0000 (11:43 +0100)
		1	2
doc/ospfd.texi	patch \|	diff1 \|	diff2 \|	blob \| history
lib/mpls.h	patch \|	diff1 \|	diff2 \|	blob \| history
ospfd/ospf_opaque.c	patch \|	diff1 \|	diff2 \|	blob \| history
ospfd/ospfd.c	patch \|	diff1 \|	diff2 \|	blob \| history