Merge pull request #3653 from dslicenc/bgpd-remote-as

author Russ White <russ@riw.us>

Tue, 29 Jan 2019 14:58:02 +0000 (09:58 -0500)

committer GitHub <noreply@github.com>

Tue, 29 Jan 2019 14:58:02 +0000 (09:58 -0500)
author Russ White <russ@riw.us>
Tue, 29 Jan 2019 14:58:02 +0000 (09:58 -0500)
committer GitHub <noreply@github.com>
Tue, 29 Jan 2019 14:58:02 +0000 (09:58 -0500)
diff --cc bgpd/bgp_vty.c
Simple merge
diff --cc bgpd/bgpd.c
Simple merge
author	Russ White <russ@riw.us>
	Tue, 29 Jan 2019 14:58:02 +0000 (09:58 -0500)
committer	GitHub <noreply@github.com>
	Tue, 29 Jan 2019 14:58:02 +0000 (09:58 -0500)
		1	2
bgpd/bgp_vty.c	patch \|	diff1 \|	diff2 \|	blob \| history
bgpd/bgpd.c	patch \|	diff1 \|	diff2 \|	blob \| history