From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Thu, 24 Aug 2017 10:03:55 +0000 (-0400)
Subject: Merge pull request #1022 from opensourcerouting/zapi_consolidation
X-Git-Tag: frr-4.0-dev~379
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=cbe6eca6a60e6910ed60998b7e0dd287fb791295;p=matthieu%2Ffrr.git

Merge pull request #1022 from opensourcerouting/zapi_consolidation

Zapi consolidation
---

cbe6eca6a60e6910ed60998b7e0dd287fb791295