Merge pull request #7069 from opensourcerouting/fix-set-metric

author Donald Sharp <sharpd@cumulusnetworks.com>

Sat, 19 Sep 2020 12:06:36 +0000 (08:06 -0400)

committer GitHub <noreply@github.com>

Sat, 19 Sep 2020 12:06:36 +0000 (08:06 -0400)
author Donald Sharp <sharpd@cumulusnetworks.com>
Sat, 19 Sep 2020 12:06:36 +0000 (08:06 -0400)
committer GitHub <noreply@github.com>
Sat, 19 Sep 2020 12:06:36 +0000 (08:06 -0400)
diff --cc tests/topotests/bgp_features/test_bgp_features.py

index 91613a0193975558c8156c76d74a02e6f1fe0d93,21cc8d227b04ae6d3da40290ee0d7f3e9c5a0ba4..7c45ca8a299c5d3b5fbc12bc7db2772142df6912

mode 100644,100755..100644
--- 1/tests/topotests/bgp_features/test_bgp_features.py
--- 2/tests/topotests/bgp_features/test_bgp_features.py
+++ b/tests/topotests/bgp_features/test_bgp_features.py
diff --cc yang/frr-route-map.yang
Simple merge
author	Donald Sharp <sharpd@cumulusnetworks.com>
	Sat, 19 Sep 2020 12:06:36 +0000 (08:06 -0400)
committer	GitHub <noreply@github.com>
	Sat, 19 Sep 2020 12:06:36 +0000 (08:06 -0400)
		1	2
tests/topotests/bgp_features/test_bgp_features.py	patch \|	diff1 \|	diff2 \|	blob \| history
yang/frr-route-map.yang	patch \|	diff1 \|	diff2 \|	blob \| history