]> git.puffer.fish Git - matthieu/frr.git/commit
projects / matthieu / frr.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 4f280b1 1e78204)
Merge branch 'master' into working/master/patch-set/4-misc-fixes
authorLou Berger <lberger@labn.net>
Thu, 26 Jan 2017 14:59:03 +0000 (09:59 -0500)
committerLou Berger <lberger@labn.net>
Thu, 26 Jan 2017 14:59:03 +0000 (09:59 -0500)
commit1c404af8b58696b70313c728a39edc2983ed9827
tree8241673a4870cb2b5a8d1262d3a793113ab60e64tree | snapshot
parent4f280b15b1049b42241e9c0ac7d2e4fa0c8e3b22commit | diff
parent1e78204400361625235b3e7ea5d2c570b16d7c55commit | diff
Merge branch 'master' into working/master/patch-set/4-misc-fixes

Merged pull request with master

Conflicts:
bgpd/bgp_mplsvpn.c
bgpd/bgp_route.c
bgpd/rfapi/rfapi_vty.c
bgpd/bgp_encap.c diff1 | diff2 | blob | history
bgpd/bgp_mplsvpn.h diff1 | diff2 | blob | history
bgpd/bgp_route.c diff1 | diff2 | blob | history
bgpd/bgp_route.h diff1 | diff2 | blob | history
bgpd/rfapi/rfapi.c diff1 | diff2 | blob | history
bgpd/rfapi/rfapi_import.c diff1 | diff2 | blob | history
bgpd/rfapi/rfapi_private.h diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.