]> git.proxmox.com Git - mirror_frr.git/commit - bgpd/rfapi/rfapi.c
Merge remote-tracking branch 'origin/master' into pr/111
authorDonald Sharp <sharpd@cumulusnetworks.com>
Fri, 27 Jan 2017 16:44:42 +0000 (11:44 -0500)
committerDonald Sharp <sharpd@cumulusnetworks.com>
Fri, 27 Jan 2017 16:44:42 +0000 (11:44 -0500)
commitc016b6c796fe3a8520fdd0f30ef377cbb73e0037
tree78c3b29b41860c367390bba20a4a4d16fbaf3469
parent75688c44d98af271ca4eb4f3133ede9e7ae709bb
parentaceb2285dad63dca7bba7177012aabdb63e1cca5
Merge remote-tracking branch 'origin/master' into pr/111
bgpd/bgp_encap.c
bgpd/bgp_encap.h
bgpd/bgp_mplsvpn.c
bgpd/bgp_mplsvpn.h
bgpd/bgp_route.c
bgpd/bgp_route.h
bgpd/bgp_vty.c
bgpd/rfapi/bgp_rfapi_cfg.c
bgpd/rfapi/rfapi.c
bgpd/rfapi/rfapi_ap.c
bgpd/rfapi/rfapi_vty.c