Merge pull request #3010 from opensourcerouting/no-frr-thread-id

author Lou Berger <lberger@labn.net>

Sat, 22 Sep 2018 19:02:09 +0000 (15:02 -0400)

committer GitHub <noreply@github.com>

Sat, 22 Sep 2018 19:02:09 +0000 (15:02 -0400)
author Lou Berger <lberger@labn.net>
Sat, 22 Sep 2018 19:02:09 +0000 (15:02 -0400)
committer GitHub <noreply@github.com>
Sat, 22 Sep 2018 19:02:09 +0000 (15:02 -0400)
diff --cc bgpd/bgpd.c
Simple merge
diff --cc bgpd/bgpd.h
Simple merge
author	Lou Berger <lberger@labn.net>
	Sat, 22 Sep 2018 19:02:09 +0000 (15:02 -0400)
committer	GitHub <noreply@github.com>
	Sat, 22 Sep 2018 19:02:09 +0000 (15:02 -0400)
		1	2
bgpd/bgpd.c	patch \|	diff1 \|	diff2 \|	blob \| history
bgpd/bgpd.h	patch \|	diff1 \|	diff2 \|	blob \| history