Merge pull request #2351 from donaldsharp/bgp_deprecation

author Lou Berger <lberger@labn.net>

Tue, 5 Jun 2018 16:05:39 +0000 (12:05 -0400)

committer GitHub <noreply@github.com>

Tue, 5 Jun 2018 16:05:39 +0000 (12:05 -0400)
author Lou Berger <lberger@labn.net>
Tue, 5 Jun 2018 16:05:39 +0000 (12:05 -0400)
committer GitHub <noreply@github.com>
Tue, 5 Jun 2018 16:05:39 +0000 (12:05 -0400)
diff --cc bgpd/bgp_vty.c
Simple merge
diff --cc doc/user/bgp.rst
Simple merge
author	Lou Berger <lberger@labn.net>
	Tue, 5 Jun 2018 16:05:39 +0000 (12:05 -0400)
committer	GitHub <noreply@github.com>
	Tue, 5 Jun 2018 16:05:39 +0000 (12:05 -0400)
		1	2
bgpd/bgp_vty.c	patch \|	diff1 \|	diff2 \|	blob \| history
doc/user/bgp.rst	patch \|	diff1 \|	diff2 \|	blob \| history