]> git.puffer.fish Git - mirror/frr.git/commitdiff
projects / mirror / frr.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f76d3ae 9f837dc)
Merge pull request #1015 from opensourcerouting/3.0-minor
authorDonald Sharp <sharpd@cumulusnetworks.com>
Tue, 22 Aug 2017 12:54:28 +0000 (08:54 -0400)
committerGitHub <noreply@github.com>
Tue, 22 Aug 2017 12:54:28 +0000 (08:54 -0400)
[3.0] kill tcp-zebra, put pseudowire-show under mpls


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.