From: garciadeblas <gerardo.garciadeblas@telefonica.com>
Date: Thu, 21 Sep 2017 16:12:58 +0000 (+0200)
Subject: Merge branch 'master' into vnffg
X-Git-Tag: v3.0.0~12^2~2
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=a92a0eaaf370c626b442863f4127cd11fc64754c;p=osm%2FRO.git

Merge branch 'master' into vnffg

Change-Id: I13e763560a923aa47a1626cdd6ff37c0c31a3aa9
Signed-off-by: garciadeblas <gerardo.garciadeblas@telefonica.com>
---

a92a0eaaf370c626b442863f4127cd11fc64754c