]> git.proxmox.com Git - mirror_frr.git/commit
Merge branch 'cmaster-next-isisd-bpf' into cmaster-next-releng
authorDavid Lamparter <equinox@opensourcerouting.org>
Mon, 28 Nov 2016 16:36:04 +0000 (17:36 +0100)
committerDavid Lamparter <equinox@opensourcerouting.org>
Mon, 28 Nov 2016 16:36:04 +0000 (17:36 +0100)
commit094add014e590550430ca5e102b44ea30cf38f0f
tree3d6067e93c4ec4b154fa0596c252d61f78841776
parentcdf76126497e0346e0cbb6fb27db2d24b3bc872e
parent4fa80053a3feee6cce264193f7fa234c880365db
Merge branch 'cmaster-next-isisd-bpf' into cmaster-next-releng