]> git.puffer.fish Git - matthieu/frr.git/commit
projects / matthieu / frr.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 31d08cd ac39ea2)
Merge branch 'stable/3.0'
authorDavid Lamparter <equinox@opensourcerouting.org>
Thu, 18 May 2017 10:28:12 +0000 (12:28 +0200)
committerDavid Lamparter <equinox@opensourcerouting.org>
Thu, 18 May 2017 10:28:12 +0000 (12:28 +0200)
commit57463530f3f8b687f238bc76020c0f168b19f0a8
tree820493847a8e55e5ceaa0742e996ae55bd49b7e0tree | snapshot
parent31d08cde94b5a5e2ee6d48564c73e4edeb4a3220commit | diff
parentac39ea282324aefc6f5849bc1051aaf676b241aecommit | diff
Merge branch 'stable/3.0'

Conflicts:
ospf6d/ospf6_lsa.c
ospfd/ospf_vty.c
zebra/interface.c

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
18 files changed:
bgpd/bgp_fsm.c diff1 | diff2 | blob | history
bgpd/bgp_packet.c diff1 | diff2 | blob | history
bgpd/bgp_vty.c diff1 | diff2 | blob | history
bgpd/bgp_zebra.c diff1 | diff2 | blob | history
bgpd/bgpd.c diff1 | diff2 | blob | history
ospf6d/ospf6_area.c diff1 | diff2 | blob | history
ospfd/ospf_apiserver.c diff1 | diff2 | blob | history
pimd/pim_cmd.c diff1 | diff2 | blob | history
pimd/pim_ifchannel.c diff1 | diff2 | blob | history
pimd/pim_igmp.c diff1 | diff2 | blob | history
pimd/pim_nht.c diff1 | diff2 | blob | history
pimd/pim_register.c diff1 | diff2 | blob | history
pimd/pim_upstream.c diff1 | diff2 | blob | history
pimd/pim_upstream.h diff1 | diff2 | blob | history
vtysh/vtysh.c diff1 | diff2 | blob | history
zebra/interface.c diff1 | diff2 | blob | history
zebra/redistribute.c diff1 | diff2 | blob | history
zebra/zebra_rnh.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.