From: David Lamparter <equinox@diac24.net>
Date: Thu, 15 Dec 2016 20:34:53 +0000 (+0100)
Subject: Merge branch 'dev/osr/vty_index'
X-Git-Tag: frr-3.0-branchpoint~114
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=f4e454eb79a6d63f0fba83635047215ac6cf0e5f;p=mirror%2Ffrr.git

Merge branch 'dev/osr/vty_index'

Acked-by: Donald Sharp <sharpd@cumulusnetworks.com>
---

f4e454eb79a6d63f0fba83635047215ac6cf0e5f