]> git.proxmox.com Git - mirror_frr.git/commitdiff
Merge branch 'stable/3.0'
authorDavid Lamparter <equinox@opensourcerouting.org>
Tue, 13 Jun 2017 15:37:58 +0000 (17:37 +0200)
committerDavid Lamparter <equinox@opensourcerouting.org>
Tue, 13 Jun 2017 15:37:58 +0000 (17:37 +0200)
Dropped:
redhat/README.rpm_build.md
redhat/daemons
redhat/frr.init
redhat/frr.logrotate
redhat/frr.spec.in

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
1  2 
configure.ac
isisd/isis_adjacency.c
ldpd/lde.c
ldpd/ldpe.c
ospf6d/ospf6_intra.c
ospfd/ospf_spf.c
ripngd/ripngd.c
zebra/zebra_mpls_openbsd.c
zebra/zserv.c

diff --cc configure.ac
Simple merge
Simple merge
diff --cc ldpd/lde.c
Simple merge
diff --cc ldpd/ldpe.c
Simple merge
Simple merge
Simple merge
diff --cc ripngd/ripngd.c
Simple merge
Simple merge
diff --cc zebra/zserv.c
Simple merge