Merge pull request #6589 from NaveenThanikachalam/gr_fixes

author Donatas Abraitis <donatas.abraitis@gmail.com>

Fri, 4 Sep 2020 15:39:26 +0000 (18:39 +0300)

committer GitHub <noreply@github.com>

Fri, 4 Sep 2020 15:39:26 +0000 (18:39 +0300)
author Donatas Abraitis <donatas.abraitis@gmail.com>
Fri, 4 Sep 2020 15:39:26 +0000 (18:39 +0300)
committer GitHub <noreply@github.com>
Fri, 4 Sep 2020 15:39:26 +0000 (18:39 +0300)
diff --cc bgpd/bgp_fsm.c
Simple merge
diff --cc bgpd/bgp_open.c
Simple merge
author	Donatas Abraitis <donatas.abraitis@gmail.com>
	Fri, 4 Sep 2020 15:39:26 +0000 (18:39 +0300)
committer	GitHub <noreply@github.com>
	Fri, 4 Sep 2020 15:39:26 +0000 (18:39 +0300)
		1	2
bgpd/bgp_fsm.c	patch \|	diff1 \|	diff2 \|	blob \| history
bgpd/bgp_open.c	patch \|	diff1 \|	diff2 \|	blob \| history