]> git.proxmox.com Git - mirror_frr.git/commit - fpm/Makefile.am
Merge remote-tracking branch 'origin/stable/2.0'
authorDonald Sharp <sharpd@cumulusnetworks.com>
Tue, 7 Feb 2017 18:20:12 +0000 (13:20 -0500)
committerDonald Sharp <sharpd@cumulusnetworks.com>
Tue, 7 Feb 2017 18:20:12 +0000 (13:20 -0500)
commit7df2e1c3797df638016ae6d7a34e1781c0f1ced5
tree2c7aa125a2e684ce5e2d91b37e4fc1e4dab7b024
parent84ea764321362381cfc2b426ef0f3329857bc83f
parent2cfe3d285ff001046b579434dea5f963082630dd
Merge remote-tracking branch 'origin/stable/2.0'
22 files changed:
bgpd/Makefile.am
bgpd/bgp_nht.c
configure.ac
isisd/Makefile.am
ldpd/Makefile.am
lib/Makefile.am
lib/memory.c
lib/thread.c
lib/thread.h
ospf6d/ospf6_interface.c
ospfd/ospf_dump.c
ospfd/ospfd.c
ospfd/ospfd.h
pimd/Makefile.am
ripd/ripd.c
tests/Makefile.am
tests/test-commands.c
tools/Makefile.am
vtysh/Makefile.am
watchfrr/watchfrr.c
zebra/Makefile.am
zebra/test_main.c