From: velandy <rajesh.velandy@riftio.com>
Date: Thu, 26 Jan 2017 20:11:55 +0000 (+0100)
Subject: Merge changes Ib5727c51,I18510f66 into v1.1
X-Git-Tag: v1.1.0~12
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=c83255e5aaedf0b65b1391d99716b17a773aa5fe;p=osm%2FSO.git

Merge changes Ib5727c51,I18510f66 into v1.1

* changes:
  Fix interface ordering for bridge interfaces in translation layer
  Fix internal connection type in rift2openmano
---

c83255e5aaedf0b65b1391d99716b17a773aa5fe