Merge branch 'v1.0' 33/933/1
authorgarciadeblas <gerardo.garciadeblas@telefonica.com>
Thu, 12 Jan 2017 14:03:58 +0000 (15:03 +0100)
committergarciadeblas <gerardo.garciadeblas@telefonica.com>
Thu, 12 Jan 2017 14:03:58 +0000 (15:03 +0100)
1  2 
nfvo.py
openmano
scripts/install-openmano.sh
vimconn_openstack.py

diff --cc nfvo.py
Simple merge
diff --cc openmano
Simple merge
Simple merge
Simple merge