Merge pull request #5216 from ton31337/fix/override_peers_ttl_if_peer_group_configured

author Donald Sharp <sharpd@cumulusnetworks.com>

Fri, 25 Oct 2019 18:03:06 +0000 (14:03 -0400)

committer GitHub <noreply@github.com>

Fri, 25 Oct 2019 18:03:06 +0000 (14:03 -0400)
author Donald Sharp <sharpd@cumulusnetworks.com>
Fri, 25 Oct 2019 18:03:06 +0000 (14:03 -0400)
committer GitHub <noreply@github.com>
Fri, 25 Oct 2019 18:03:06 +0000 (14:03 -0400)
diff --cc bgpd/bgpd.c
Simple merge
diff --cc bgpd/bgpd.h
Simple merge
author	Donald Sharp <sharpd@cumulusnetworks.com>
	Fri, 25 Oct 2019 18:03:06 +0000 (14:03 -0400)
committer	GitHub <noreply@github.com>
	Fri, 25 Oct 2019 18:03:06 +0000 (14:03 -0400)
		1	2
bgpd/bgpd.c	patch \|	diff1 \|	diff2 \|	blob \| history
bgpd/bgpd.h	patch \|	diff1 \|	diff2 \|	blob \| history