]> git.puffer.fish Git - mirror/frr.git/commitdiff
Merge pull request #1022 from opensourcerouting/zapi_consolidation
authorDonald Sharp <sharpd@cumulusnetworks.com>
Thu, 24 Aug 2017 10:03:55 +0000 (06:03 -0400)
committerGitHub <noreply@github.com>
Thu, 24 Aug 2017 10:03:55 +0000 (06:03 -0400)
Zapi consolidation


Trivial merge