]> git.puffer.fish Git - matthieu/frr.git/commit
Merge remote-tracking branch 'origin/pr/113' into pr/111
authorDonald Sharp <sharpd@cumulusnetworks.com>
Fri, 27 Jan 2017 17:39:06 +0000 (12:39 -0500)
committerDonald Sharp <sharpd@cumulusnetworks.com>
Fri, 27 Jan 2017 17:39:06 +0000 (12:39 -0500)
commit1dc84b65dfb4436d2b63cdb29bf71bc66c0e7940
tree0b153f2cd2fd4b3c8fc68249b6df6bc52c706fb7
parentc016b6c796fe3a8520fdd0f30ef377cbb73e0037
parent1c404af8b58696b70313c728a39edc2983ed9827
Merge remote-tracking branch 'origin/pr/113' into pr/111
bgpd/bgp_encap.c
bgpd/bgp_mplsvpn.c
bgpd/bgp_mplsvpn.h
bgpd/bgp_route.c
bgpd/rfapi/rfapi.c