From: Don Slice <dslice@cumulusnetworks.com>
Date: Wed, 17 May 2017 11:38:59 +0000 (-0400)
Subject: Merge branch 'stable/2.0' into bgp-fixes
X-Git-Tag: frr-3.0-rc0~17^2~4^2
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=refs%2Fpull%2F556%2Fhead;p=mirror%2Ffrr.git

Merge branch 'stable/2.0' into bgp-fixes
---

24de86bc6b956fb7d636498eda335aeddbfae783