Merge pull request #561 from donaldsharp/static_config2

author Renato Westphal <renato@openbsd.org>

Wed, 17 May 2017 17:18:51 +0000 (14:18 -0300)

committer GitHub <noreply@github.com>

Wed, 17 May 2017 17:18:51 +0000 (14:18 -0300)
author Renato Westphal <renato@openbsd.org>
Wed, 17 May 2017 17:18:51 +0000 (14:18 -0300)
committer GitHub <noreply@github.com>
Wed, 17 May 2017 17:18:51 +0000 (14:18 -0300)
diff --cc bgpd/bgp_vty.c
Simple merge
diff --cc pimd/pim_vty.c
Simple merge
diff --cc zebra/zebra_vty.c
Simple merge
author	Renato Westphal <renato@openbsd.org>
	Wed, 17 May 2017 17:18:51 +0000 (14:18 -0300)
committer	GitHub <noreply@github.com>
	Wed, 17 May 2017 17:18:51 +0000 (14:18 -0300)
		1	2
bgpd/bgp_vty.c	patch \|	diff1 \|	diff2 \|	blob \| history
pimd/pim_vty.c	patch \|	diff1 \|	diff2 \|	blob \| history
zebra/zebra_vty.c	patch \|	diff1 \|	diff2 \|	blob \| history