]> git.proxmox.com Git - mirror_frr.git/commitdiff
Merge pull request #5802 from ton31337/feature/aggregate-address_origin_override
authorDonald Sharp <sharpd@cumulusnetworks.com>
Wed, 19 Feb 2020 13:38:31 +0000 (08:38 -0500)
committerGitHub <noreply@github.com>
Wed, 19 Feb 2020 13:38:31 +0000 (08:38 -0500)
bgpd: Allow overriding ORIGIN for aggregate-address

1  2 
bgpd/bgp_route.c
bgpd/bgpd.h

Simple merge
diff --cc bgpd/bgpd.h
Simple merge