Merge pull request #5172 from donaldsharp/sa_clean_and_clean

author Renato Westphal <renato@opensourcerouting.org>

Fri, 18 Oct 2019 02:14:31 +0000 (23:14 -0300)

committer GitHub <noreply@github.com>

Fri, 18 Oct 2019 02:14:31 +0000 (23:14 -0300)
author Renato Westphal <renato@opensourcerouting.org>
Fri, 18 Oct 2019 02:14:31 +0000 (23:14 -0300)
committer GitHub <noreply@github.com>
Fri, 18 Oct 2019 02:14:31 +0000 (23:14 -0300)
diff --cc bgpd/bgp_evpn.c
Simple merge
diff --cc bgpd/bgp_route.c
Simple merge
diff --cc doc/user/bgp.rst
Simple merge
author	Renato Westphal <renato@opensourcerouting.org>
	Fri, 18 Oct 2019 02:14:31 +0000 (23:14 -0300)
committer	GitHub <noreply@github.com>
	Fri, 18 Oct 2019 02:14:31 +0000 (23:14 -0300)
		1	2
bgpd/bgp_evpn.c	patch \|	diff1 \|	diff2 \|	blob \| history
bgpd/bgp_route.c	patch \|	diff1 \|	diff2 \|	blob \| history
doc/user/bgp.rst	patch \|	diff1 \|	diff2 \|	blob \| history