Merge branch 'v1.0' 88/788/1
authorRajesh Velandy <rajesh.velandy@riftio.com>
Wed, 14 Dec 2016 18:18:39 +0000 (18:18 +0000)
committervelandy <rajesh.velandy@riftio.com>
Wed, 14 Dec 2016 18:21:15 +0000 (18:21 +0000)
commitd748ab1836d94ebe1273b1910954be3b2a2b4486
tree3553c33bbdb8c7e11c9dec661f7b753bca79f813
parent308419079128a5c2ccd9c027e45bf225ceba50cf
parent23f42559b7df2fd53fe3f9f836fe75aa58165f6e
Merge branch 'v1.0'

Signed-off-by: velandy <rajesh.velandy@riftio.com>
models/openmano/python/rift/openmano/rift2openmano.py
models/plugins/yang/mano-types.yang
models/plugins/yang/nsr.yang
models/plugins/yang/vnfr.yang
rwcal/plugins/vala/rwcal_openstack/rwcal_openstack.py
rwcal/plugins/yang/rwcal.yang
rwlaunchpad/plugins/rwnsm/rift/tasklets/rwnsmtasklet/openmano_nsm.py
rwlaunchpad/plugins/rwnsm/rift/tasklets/rwnsmtasklet/rwnsmtasklet.py
rwlaunchpad/plugins/rwvnfm/rift/tasklets/rwvnfmtasklet/rwvnfmtasklet.py