]> git.puffer.fish Git - mirror/frr.git/commit
Merge branch 'cmaster-next' into vtysh-grammar
authorQuentin Young <qlyoung@cumulusnetworks.com>
Thu, 20 Oct 2016 16:31:49 +0000 (16:31 +0000)
committerQuentin Young <qlyoung@cumulusnetworks.com>
Thu, 20 Oct 2016 16:31:49 +0000 (16:31 +0000)
commit0a538fc98fb662b4cf2d927ac29fd9af4a4fab03
treef6dbe2af92d44f9a77e4802cefb440811dd69584
parente52702f29d003585dcfbb4914b2a52d77a177739
parent41246cb61418102f9f3bfa3e0acfce90c7798e67
Merge branch 'cmaster-next' into vtysh-grammar

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
Conflicts:
isisd/isis_routemap.c
zebra/rt_netlink.c
28 files changed:
bgpd/bgp_aspath.c
bgpd/bgp_attr.c
bgpd/bgp_dump.c
bgpd/bgp_mplsvpn.c
bgpd/bgp_nexthop.c
bgpd/bgp_route.c
bgpd/bgp_routemap.c
bgpd/bgpd.c
configure.ac
isisd/isis_routemap.c
lib/Makefile.am
lib/command.c
lib/command.h
lib/route_types.txt
lib/routemap.c
lib/routemap.h
ospf6d/ospf6_asbr.c
ospfd/ospf_routemap.c
pimd/pim_routemap.c
ripd/rip_routemap.c
ripngd/ripng_routemap.c
vtysh/vtysh.c
zebra/if_netlink.c
zebra/kernel_null.c
zebra/rt_netlink.c
zebra/zebra_fpm_netlink.c
zebra/zebra_routemap.c
zebra/zserv.c