]> git.puffer.fish Git - matthieu/frr.git/commit
projects / matthieu / frr.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 0276dd5 d987f23)
Merge branch 'stable/2.0'
authorDavid Lamparter <equinox@opensourcerouting.org>
Thu, 8 Dec 2016 12:21:21 +0000 (13:21 +0100)
committerDavid Lamparter <equinox@opensourcerouting.org>
Thu, 8 Dec 2016 12:21:21 +0000 (13:21 +0100)
commitd5bd3e0a6f857af84c247ddea52369352c7c97ac
treefa5eb06d42f33bbadb78e70669a0e5569e61407btree | snapshot
parent0276dd5d4bc6a9fdf27ae67558be6d921042405ecommit | diff
parentd987f2339d25d32b654dabfe98a40677029575fecommit | diff
Merge branch 'stable/2.0'

Conflicts:
bgpd/rfapi/bgp_rfapi_cfg.c
bgpd/rfapi/vnc_debug.c

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
bgpd/rfapi/bgp_rfapi_cfg.c diff1 | diff2 | blob | history
bgpd/rfapi/rfapi.c diff1 | diff2 | blob | history
bgpd/rfapi/rfapi_vty.c diff1 | diff2 | blob | history
bgpd/rfapi/vnc_debug.c diff1 | diff2 | blob | history
isisd/isis_circuit.c diff1 | diff2 | blob | history
isisd/isis_te.c diff1 | diff2 | blob | history
ripngd/ripngd.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.