Merge pull request #1370 from dslicenc/cm18408-bgp-timers

author Renato Westphal <renato@openbsd.org>

Mon, 6 Nov 2017 16:06:12 +0000 (14:06 -0200)

committer GitHub <noreply@github.com>

Mon, 6 Nov 2017 16:06:12 +0000 (14:06 -0200)
author Renato Westphal <renato@openbsd.org>
Mon, 6 Nov 2017 16:06:12 +0000 (14:06 -0200)
committer GitHub <noreply@github.com>
Mon, 6 Nov 2017 16:06:12 +0000 (14:06 -0200)
diff --cc bgpd/bgp_packet.c
Simple merge
diff --cc bgpd/bgp_vty.c
Simple merge
author	Renato Westphal <renato@openbsd.org>
	Mon, 6 Nov 2017 16:06:12 +0000 (14:06 -0200)
committer	GitHub <noreply@github.com>
	Mon, 6 Nov 2017 16:06:12 +0000 (14:06 -0200)
		1	2
bgpd/bgp_packet.c	patch \|	diff1 \|	diff2 \|	blob \| history
bgpd/bgp_vty.c	patch \|	diff1 \|	diff2 \|	blob \| history