Merge "Bug 140"

author velandy <rajesh.velandy@riftio.com>

Mon, 9 Jan 2017 17:05:30 +0000 (18:05 +0100)

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

Mon, 9 Jan 2017 17:05:30 +0000 (18:05 +0100)
author velandy <rajesh.velandy@riftio.com>
Mon, 9 Jan 2017 17:05:30 +0000 (18:05 +0100)
committer Gerrit Code Review <root@osm.etsi.org>
Mon, 9 Jan 2017 17:05:30 +0000 (18:05 +0100)
diff --cc models/plugins/yang/vnfd.yang
Simple merge
diff --cc rwlaunchpad/plugins/rwvnfm/rift/tasklets/rwvnfmtasklet/rwvnfmtasklet.py
Simple merge
author	velandy <rajesh.velandy@riftio.com>
	Mon, 9 Jan 2017 17:05:30 +0000 (18:05 +0100)
committer	Gerrit Code Review <root@osm.etsi.org>
	Mon, 9 Jan 2017 17:05:30 +0000 (18:05 +0100)
		1	2
models/plugins/yang/vnfd.yang	patch \|	diff1 \|	diff2 \|	blob \| history
rwlaunchpad/plugins/rwvnfm/rift/tasklets/rwvnfmtasklet/rwvnfmtasklet.py	patch \|	diff1 \|	diff2 \|	blob \| history