]> git.proxmox.com Git - mirror_frr.git/commitdiff
Merge pull request #1047 from dwalton76/bgpd-draft-ietf-grow-bgp-gshut-10
authorRenato Westphal <renato@openbsd.org>
Tue, 5 Sep 2017 13:20:49 +0000 (10:20 -0300)
committerGitHub <noreply@github.com>
Tue, 5 Sep 2017 13:20:49 +0000 (10:20 -0300)
bgpd: implement draft-ietf-grow-bgp-gshut-10

1  2 
bgpd/bgp_attr.c
bgpd/bgp_clist.c
bgpd/bgp_route.c
bgpd/bgp_route.h
bgpd/bgp_routemap.c
bgpd/bgp_vty.c
bgpd/bgpd.c
bgpd/bgpd.h

diff --cc bgpd/bgp_attr.c
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc bgpd/bgp_vty.c
Simple merge
diff --cc bgpd/bgpd.c
Simple merge
diff --cc bgpd/bgpd.h
Simple merge