]> git.puffer.fish Git - matthieu/frr.git/commit
projects / matthieu / frr.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 496e83a 6f3b385)
Merge branch 'stable/2.0-for-merge'
authorDavid Lamparter <equinox@opensourcerouting.org>
Fri, 13 Jan 2017 14:24:25 +0000 (15:24 +0100)
committerDavid Lamparter <equinox@opensourcerouting.org>
Fri, 13 Jan 2017 14:24:25 +0000 (15:24 +0100)
commitb6f1faf04596242329d8ecd95b732f1d396e7823
tree901c5d924c7b77ba7a7ac561c060e223a3e5f8cdtree | snapshot
parent496e83a5d761220bfe9b31e66fe513ccf05e0a6acommit | diff
parent6f3b38578810977af89bdd7903b4c5e6146f9cbecommit | diff
Merge branch 'stable/2.0-for-merge'

Conflicts (CLI vs. atol()):
- bgpd/bgp_vty.c
- ospfd/ospf_vty.c
- zebra/zebra_vty.c

NB: pull req #65 (LabNConsulting/working/2.0/afi-safi-vty/c) was
excluded from this merge.

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
bgpd/bgp_vty.c diff1 | diff2 | blob | history
lib/vrf.c diff1 | diff2 | blob | history
ospf6d/ospf6_area.c diff1 | diff2 | blob | history
ospfd/ospf_vty.c diff1 | diff2 | blob | history
zebra/zebra_vty.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.