Merge "Descriptor Unification"

author velandy <rajesh.velandy@riftio.com>

Mon, 28 Nov 2016 20:07:02 +0000 (21:07 +0100)

committer Gerrit Code Review <root@osm.etsi.org>

Mon, 28 Nov 2016 20:07:02 +0000 (21:07 +0100)
author velandy <rajesh.velandy@riftio.com>
Mon, 28 Nov 2016 20:07:02 +0000 (21:07 +0100)
committer Gerrit Code Review <root@osm.etsi.org>
Mon, 28 Nov 2016 20:07:02 +0000 (21:07 +0100)
diff --cc rwcal/plugins/vala/rwcal_openstack/rift/rwcal/openstack/openstack_drv.py
Simple merge
diff --cc rwlaunchpad/plugins/rwnsm/rift/tasklets/rwnsmtasklet/rwnsmtasklet.py
Simple merge
diff --cc rwlaunchpad/plugins/rwvnfm/rift/tasklets/rwvnfmtasklet/rwvnfmtasklet.py
Simple merge
author	velandy <rajesh.velandy@riftio.com>
	Mon, 28 Nov 2016 20:07:02 +0000 (21:07 +0100)
committer	Gerrit Code Review <root@osm.etsi.org>
	Mon, 28 Nov 2016 20:07:02 +0000 (21:07 +0100)
		1	2
rwcal/plugins/vala/rwcal_openstack/rift/rwcal/openstack/openstack_drv.py	patch \|	diff1 \|	diff2 \|	blob \| history
rwlaunchpad/plugins/rwnsm/rift/tasklets/rwnsmtasklet/rwnsmtasklet.py	patch \|	diff1 \|	diff2 \|	blob \| history
rwlaunchpad/plugins/rwvnfm/rift/tasklets/rwvnfmtasklet/rwvnfmtasklet.py	patch \|	diff1 \|	diff2 \|	blob \| history