Merge pull request #714 from opensourcerouting/cli_magic_defpy

author Donald Sharp <sharpd@cumulusnetworks.com>

Wed, 28 Jun 2017 13:48:33 +0000 (09:48 -0400)

committer GitHub <noreply@github.com>

Wed, 28 Jun 2017 13:48:33 +0000 (09:48 -0400)
author Donald Sharp <sharpd@cumulusnetworks.com>
Wed, 28 Jun 2017 13:48:33 +0000 (09:48 -0400)
committer GitHub <noreply@github.com>
Wed, 28 Jun 2017 13:48:33 +0000 (09:48 -0400)
diff --cc bgpd/bgp_debug.c
Simple merge
diff --cc bgpd/bgp_vty.c
Simple merge
diff --cc configure.ac
Simple merge
diff --cc lib/Makefile.am
Simple merge
diff --cc tests/Makefile.am
Simple merge
diff --cc zebra/Makefile.am
Simple merge
author	Donald Sharp <sharpd@cumulusnetworks.com>
	Wed, 28 Jun 2017 13:48:33 +0000 (09:48 -0400)
committer	GitHub <noreply@github.com>
	Wed, 28 Jun 2017 13:48:33 +0000 (09:48 -0400)
		1	2
bgpd/bgp_debug.c	patch \|	diff1 \|	diff2 \|	blob \| history
bgpd/bgp_vty.c	patch \|	diff1 \|	diff2 \|	blob \| history
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history
lib/Makefile.am	patch \|	diff1 \|	diff2 \|	blob \| history
tests/Makefile.am	patch \|	diff1 \|	diff2 \|	blob \| history
zebra/Makefile.am	patch \|	diff1 \|	diff2 \|	blob \| history