Merge branch 'feature7106' 57/7457/1
authortierno <alfonso.tiernosepulveda@telefonica.com>
Mon, 13 May 2019 10:18:28 +0000 (10:18 +0000)
committertierno <alfonso.tiernosepulveda@telefonica.com>
Mon, 13 May 2019 10:18:42 +0000 (10:18 +0000)
Change-Id: I1670f7013c63c7a5e5c6855fe3ea168423f86834
Signed-off-by: tierno <alfonso.tiernosepulveda@telefonica.com>
1  2 
osm_ro/nfvo.py
osm_ro/vimconn_openstack.py

diff --cc osm_ro/nfvo.py
Simple merge
Simple merge