Merge pull request #1477 from chiragshah6/ospf_vrf_dev

author Russ White <russ@riw.us>

Wed, 29 Nov 2017 12:39:35 +0000 (07:39 -0500)

committer GitHub <noreply@github.com>

Wed, 29 Nov 2017 12:39:35 +0000 (07:39 -0500)
author Russ White <russ@riw.us>
Wed, 29 Nov 2017 12:39:35 +0000 (07:39 -0500)
committer GitHub <noreply@github.com>
Wed, 29 Nov 2017 12:39:35 +0000 (07:39 -0500)
diff --cc ospfd/ospf_vty.c
Simple merge
diff --cc ospfd/ospfd.h
Simple merge
author	Russ White <russ@riw.us>
	Wed, 29 Nov 2017 12:39:35 +0000 (07:39 -0500)
committer	GitHub <noreply@github.com>
	Wed, 29 Nov 2017 12:39:35 +0000 (07:39 -0500)
		1	2
ospfd/ospf_vty.c	patch \|	diff1 \|	diff2 \|	blob \| history
ospfd/ospfd.h	patch \|	diff1 \|	diff2 \|	blob \| history