]> git.proxmox.com Git - mirror_frr.git/commit
Merge remote-tracking branch 'cmaster-next' into cmaster-next-releng
authorDavid Lamparter <equinox@opensourcerouting.org>
Sat, 19 Nov 2016 10:58:52 +0000 (11:58 +0100)
committerDavid Lamparter <equinox@opensourcerouting.org>
Sat, 19 Nov 2016 10:58:52 +0000 (11:58 +0100)
commit6a49d0cc12ff5192291bcc4e5c7ac8bec5c1e78c
tree00b9d1256ecc602a3c1a1cedd49b65d9ad96733e
parentc5d9d3bb361a7ccf58c3a75ce20d48dcde51210a
parent50e24903ba3e90d3502428eaa1bdb961de305c72
Merge remote-tracking branch 'cmaster-next' into cmaster-next-releng
bgpd/bgp_vty.c
lib/bitfield.h