osm.etsi.org Git - osm/RO.git/commit

projects / osm / RO.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 0446cd5 7fe8264)

author	Anderson Bravalheri <a.bravalheri@bristol.ac.uk>
	Wed, 28 Nov 2018 17:21:26 +0000 (17:21 +0000)
committer	Anderson Bravalheri <a.bravalheri@bristol.ac.uk>
	Wed, 28 Nov 2018 17:21:26 +0000 (17:21 +0000)
commit	c5293def02d95ed4ee086dd8842437b76ec05c4e
tree	3fd396ff7db3013fd1d78be6d662be10a6bea0a3	tree \| snapshot
parent	0446cd5df24c38f95cea13b995c553e9b2403f21	commit \| diff
parent	7fe82640f590cc66a9b11adf0d25abceedf892de	commit \| diff

Merge remote-tracking branch 'upstream/master' into gerrit-submission

Sync with master branch

Change-Id: Ic26d043a84f50f48eeebffb512ccea2eedc053a4
Signed-off-by: Anderson Bravalheri <a.bravalheri@bristol.ac.uk>

19 files changed:

.gitignore-common	diff1 \|	diff2 \|	blob \| history
database_utils/migrate_mano_db.sh	diff1 \|	diff2 \|	blob \| history
docker/Dockerfile-local	diff1 \|	diff2 \|	blob \| history
openmano	diff1 \|	diff2 \|	blob \| history
openmanod	diff1 \|	diff2 \|	blob \| history
osm_ro/db_base.py	diff1 \|	diff2 \|	blob \| history
osm_ro/httpserver.py	diff1 \|	diff2 \|	blob \| history
osm_ro/nfvo.py	diff1 \|	diff2 \|	blob \| history
osm_ro/nfvo_db.py	diff1 \|	diff2 \|	blob \| history
osm_ro/openmano_schemas.py	diff1 \|	diff2 \|	blob \| history
osm_ro/openmanoclient.py	diff1 \|	diff2 \|	blob \| history
osm_ro/openmanod.cfg	diff1 \|	diff2 \|	blob \| history
osm_ro/utils.py	diff1 \|	diff2 \|	blob \| history
osm_ro/vim_thread.py	diff1 \|	diff2 \|	blob \| history
osm_ro/vimconn_openstack.py	diff1 \|	diff2 \|	blob \| history
scripts/install-openmano.sh	diff1 \|	diff2 \|	blob \| history
setup.py	diff1 \|	diff2 \|	blob \| history
test/test_RO.py	diff1 \|	diff2 \|	blob \| history
test/test_openmanoclient.py	diff1 \|	diff2 \|	blob \| history