]> git.puffer.fish Git - matthieu/frr.git/commit
bgp: Fix merge mistake
authorLou Berger <lberger@labn.net>
Fri, 27 Jan 2017 19:30:27 +0000 (14:30 -0500)
committerDonald Sharp <sharpd@cumulusnetworks.com>
Fri, 27 Jan 2017 19:31:41 +0000 (14:31 -0500)
commit1edcd64259473988969f3029ccdf87f36c4cda28
tree6baa40c884ca5adce313bc3e8e68fe786747354d
parent7395a2c994953a9ee773ce94addea5b3b50c18bf
bgp: Fix merge mistake

I choose the wrong merge direction.  Fixed.

Signed-off-by: Lou Berger <lberger@labn.net>
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
bgpd/bgp_route.c