Merge pull request #3255 from dslicenc/show_evpn_mac_json

author Russ White <russ@riw.us>

Thu, 1 Nov 2018 01:47:18 +0000 (21:47 -0400)

committer GitHub <noreply@github.com>

Thu, 1 Nov 2018 01:47:18 +0000 (21:47 -0400)
author Russ White <russ@riw.us>
Thu, 1 Nov 2018 01:47:18 +0000 (21:47 -0400)
committer GitHub <noreply@github.com>
Thu, 1 Nov 2018 01:47:18 +0000 (21:47 -0400)
diff --cc zebra/zebra_vty.c
Simple merge
diff --cc zebra/zebra_vxlan.c
Simple merge
author	Russ White <russ@riw.us>
	Thu, 1 Nov 2018 01:47:18 +0000 (21:47 -0400)
committer	GitHub <noreply@github.com>
	Thu, 1 Nov 2018 01:47:18 +0000 (21:47 -0400)
		1	2
zebra/zebra_vty.c	patch \|	diff1 \|	diff2 \|	blob \| history
zebra/zebra_vxlan.c	patch \|	diff1 \|	diff2 \|	blob \| history