Merge pull request #2926 from donaldsharp/router

author David Lamparter <equinox@diac24.net>

Fri, 26 Oct 2018 20:24:15 +0000 (22:24 +0200)

committer GitHub <noreply@github.com>

Fri, 26 Oct 2018 20:24:15 +0000 (22:24 +0200)
author David Lamparter <equinox@diac24.net>
Fri, 26 Oct 2018 20:24:15 +0000 (22:24 +0200)
committer GitHub <noreply@github.com>
Fri, 26 Oct 2018 20:24:15 +0000 (22:24 +0200)
diff --cc zebra/zebra_vty.c
Simple merge
diff --cc zebra/zebra_vxlan.c
Simple merge
author	David Lamparter <equinox@diac24.net>
	Fri, 26 Oct 2018 20:24:15 +0000 (22:24 +0200)
committer	GitHub <noreply@github.com>
	Fri, 26 Oct 2018 20:24:15 +0000 (22:24 +0200)
		1	2
zebra/zebra_vty.c	patch \|	diff1 \|	diff2 \|	blob \| history
zebra/zebra_vxlan.c	patch \|	diff1 \|	diff2 \|	blob \| history