Merge pull request #6814 from gpnaveen/ospf_basic_functionality

author Donald Sharp <sharpd@cumulusnetworks.com>

Sat, 19 Sep 2020 01:20:04 +0000 (21:20 -0400)

committer GitHub <noreply@github.com>

Sat, 19 Sep 2020 01:20:04 +0000 (21:20 -0400)
author Donald Sharp <sharpd@cumulusnetworks.com>
Sat, 19 Sep 2020 01:20:04 +0000 (21:20 -0400)
committer GitHub <noreply@github.com>
Sat, 19 Sep 2020 01:20:04 +0000 (21:20 -0400)
diff --cc tests/topotests/lib/common_config.py
Simple merge
diff --cc tests/topotests/lib/topojson.py
Simple merge
author	Donald Sharp <sharpd@cumulusnetworks.com>
	Sat, 19 Sep 2020 01:20:04 +0000 (21:20 -0400)
committer	GitHub <noreply@github.com>
	Sat, 19 Sep 2020 01:20:04 +0000 (21:20 -0400)
		1	2
tests/topotests/lib/common_config.py	patch \|	diff1 \|	diff2 \|	blob \| history
tests/topotests/lib/topojson.py	patch \|	diff1 \|	diff2 \|	blob \| history