From: tierno <alfonso.tiernosepulveda@telefonica.com>
Date: Mon, 1 Jun 2020 06:23:06 +0000 (+0000)
Subject: Merge branch 'contrail' into master
X-Git-Tag: release-v8.0-start~19
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=refs%2Fchanges%2F10%2F9010%2F1;p=osm%2FRO.git

Merge branch 'contrail' into master

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

d0f7e798d3462027dc2c8d612a89600f4a6bad3e