Merge pull request #10726 from chiragshah6/fdev2

author Sri Mohana Singamsetty <srimohans@gmail.com>

Wed, 23 Mar 2022 05:05:47 +0000 (22:05 -0700)

committer GitHub <noreply@github.com>

Wed, 23 Mar 2022 05:05:47 +0000 (22:05 -0700)
author Sri Mohana Singamsetty <srimohans@gmail.com>
Wed, 23 Mar 2022 05:05:47 +0000 (22:05 -0700)
committer GitHub <noreply@github.com>
Wed, 23 Mar 2022 05:05:47 +0000 (22:05 -0700)
diff --cc zebra/zebra_evpn_mac.h
Simple merge
diff --cc zebra/zebra_vxlan.c
Simple merge
author	Sri Mohana Singamsetty <srimohans@gmail.com>
	Wed, 23 Mar 2022 05:05:47 +0000 (22:05 -0700)
committer	GitHub <noreply@github.com>
	Wed, 23 Mar 2022 05:05:47 +0000 (22:05 -0700)
		1	2
zebra/zebra_evpn_mac.h	patch \|	diff1 \|	diff2 \|	blob \| history
zebra/zebra_vxlan.c	patch \|	diff1 \|	diff2 \|	blob \| history