From: Olivier Dugeon <olivier.dugeon@orange.com>
Date: Tue, 30 Jan 2018 10:43:25 +0000 (+0100)
Subject: Merge remote-tracking 'frr/master' into SR-Routing
X-Git-Tag: frr-4.0-dev~2^2~5
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=dab8b7a81c42c62a3effbcf157ff6a125871792c;p=mirror_frr.git

Merge remote-tracking 'frr/master' into SR-Routing
---

dab8b7a81c42c62a3effbcf157ff6a125871792c