Merge branch 'v1.0'

author garciadeblas <gerardo.garciadeblas@telefonica.com>

Thu, 12 Jan 2017 14:03:58 +0000 (15:03 +0100)

committer garciadeblas <gerardo.garciadeblas@telefonica.com>

Thu, 12 Jan 2017 14:03:58 +0000 (15:03 +0100)
author garciadeblas <gerardo.garciadeblas@telefonica.com>
Thu, 12 Jan 2017 14:03:58 +0000 (15:03 +0100)
committer garciadeblas <gerardo.garciadeblas@telefonica.com>
Thu, 12 Jan 2017 14:03:58 +0000 (15:03 +0100)
diff --cc nfvo.py
Simple merge
diff --cc openmano
Simple merge
diff --cc scripts/install-openmano.sh
Simple merge
diff --cc vimconn_openstack.py
Simple merge
author	garciadeblas <gerardo.garciadeblas@telefonica.com>
	Thu, 12 Jan 2017 14:03:58 +0000 (15:03 +0100)
committer	garciadeblas <gerardo.garciadeblas@telefonica.com>
	Thu, 12 Jan 2017 14:03:58 +0000 (15:03 +0100)
		1	2
nfvo.py	patch \|	diff1 \|	diff2 \|	blob \| history
openmano	patch \|	diff1 \|	diff2 \|	blob \| history
scripts/install-openmano.sh	patch \|	diff1 \|	diff2 \|	blob \| history
vimconn_openstack.py	patch \|	diff1 \|	diff2 \|	blob \| history