]> git.proxmox.com Git - mirror_frr.git/commit
Merge remote-tracking branch 'origin/master' into bgpafisafi
authorDonald Sharp <sharpd@cumulusnetworks.com>
Thu, 26 Jan 2017 15:38:07 +0000 (10:38 -0500)
committerDonald Sharp <sharpd@cumulusnetworks.com>
Thu, 26 Jan 2017 15:38:07 +0000 (10:38 -0500)
commit7f12cb2b659196bd818b3d5ddd1929d83dc85069
treef07849247b6b51088eacc182d91f8fe346a3bf69
parentc493f2d83a990b5fec0ea927915c46c47d7ed636
parent1e78204400361625235b3e7ea5d2c570b16d7c55
Merge remote-tracking branch 'origin/master' into bgpafisafi
bgpd/bgp_mplsvpn.c
bgpd/bgp_route.c
bgpd/bgp_routemap.c
bgpd/bgp_vty.c