Merge branch 'master' into vnffg 81/2281/1
authorgarciadeblas <gerardo.garciadeblas@telefonica.com>
Thu, 21 Sep 2017 16:12:58 +0000 (18:12 +0200)
committergarciadeblas <gerardo.garciadeblas@telefonica.com>
Thu, 21 Sep 2017 16:12:58 +0000 (18:12 +0200)
Change-Id: I13e763560a923aa47a1626cdd6ff37c0c31a3aa9
Signed-off-by: garciadeblas <gerardo.garciadeblas@telefonica.com>
1  2 
osm_ro/vimconn.py

Simple merge