Merge pull request #3023 from qlyoung/ultimate-warning-reference-cards-rename

author David Lamparter <equinox@diac24.net>

Fri, 14 Sep 2018 15:35:58 +0000 (17:35 +0200)

committer GitHub <noreply@github.com>

Fri, 14 Sep 2018 15:35:58 +0000 (17:35 +0200)
author David Lamparter <equinox@diac24.net>
Fri, 14 Sep 2018 15:35:58 +0000 (17:35 +0200)
committer GitHub <noreply@github.com>
Fri, 14 Sep 2018 15:35:58 +0000 (17:35 +0200)
diff --cc bgpd/bgp_vty.c
Simple merge
diff --cc bgpd/rfapi/vnc_import_bgp.c
Simple merge
diff --cc zebra/interface.c
Simple merge
author	David Lamparter <equinox@diac24.net>
	Fri, 14 Sep 2018 15:35:58 +0000 (17:35 +0200)
committer	GitHub <noreply@github.com>
	Fri, 14 Sep 2018 15:35:58 +0000 (17:35 +0200)
		1	2
bgpd/bgp_vty.c	patch \|	diff1 \|	diff2 \|	blob \| history
bgpd/rfapi/vnc_import_bgp.c	patch \|	diff1 \|	diff2 \|	blob \| history
zebra/interface.c	patch \|	diff1 \|	diff2 \|	blob \| history