From: tierno <alfonso.tiernosepulveda@telefonica.com>
Date: Thu, 28 May 2020 16:07:06 +0000 (+0000)
Subject: Merge branch 'contrail' into v7.0
X-Git-Tag: v7.1.0rc5^0
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=refs%2Fchanges%2F95%2F8995%2F2;p=osm%2FRO.git

Merge branch 'contrail' into v7.0

Change-Id: I25cc61d45ac002c43875c610d34ac79e1d84457f
Signed-off-by: tierno <alfonso.tiernosepulveda@telefonica.com>
---

2b9adea1c01414b2522ffc9fe1fd187c374ffdf8