Merge pull request #3077 from rgirada/ospf_2980_fix

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

Tue, 9 Oct 2018 17:07:33 +0000 (19:07 +0200)

committer GitHub <noreply@github.com>

Tue, 9 Oct 2018 17:07:33 +0000 (19:07 +0200)
author Olivier Dugeon <olivier.dugeon@orange.com>
Tue, 9 Oct 2018 17:07:33 +0000 (19:07 +0200)
committer GitHub <noreply@github.com>
Tue, 9 Oct 2018 17:07:33 +0000 (19:07 +0200)
diff --cc ospfd/ospf_vty.c
Simple merge
diff --cc ospfd/ospf_zebra.c
Simple merge
author	Olivier Dugeon <olivier.dugeon@orange.com>
	Tue, 9 Oct 2018 17:07:33 +0000 (19:07 +0200)
committer	GitHub <noreply@github.com>
	Tue, 9 Oct 2018 17:07:33 +0000 (19:07 +0200)
		1	2
ospfd/ospf_vty.c	patch \|	diff1 \|	diff2 \|	blob \| history
ospfd/ospf_zebra.c	patch \|	diff1 \|	diff2 \|	blob \| history