Merge v1.1 to master_vca_intg 68/1068/1
authorPhilip Joseph <philip.joseph@riftio.com>
Mon, 6 Feb 2017 06:53:19 +0000 (12:23 +0530)
committerPhilip Joseph <philip.joseph@riftio.com>
Mon, 6 Feb 2017 06:53:19 +0000 (12:23 +0530)
commitfdc99cc2344cbe561c78527565bacc797ef096e3
tree6a9ad0c95310754fcbc57d469658bea081eb2b8c
parent297fabfc5644e0499963ff283b68587dca3d16f7
parentaf759326472a5e2ab802f83555cc60a48c197078
Merge v1.1 to master_vca_intg

Signed-off-by: Philip Joseph <philip.joseph@riftio.com>
models/plugins/yang/mano-types.yang
models/plugins/yang/nsd.yang
models/plugins/yang/vnfd.yang
rwcm/plugins/rwconman/rift/tasklets/rwconmantasklet/rwconman_config.py
rwlaunchpad/plugins/rwnsm/rift/tasklets/rwnsmtasklet/cloud.py
rwlaunchpad/plugins/rwnsm/rift/tasklets/rwnsmtasklet/openmano_nsm.py
rwlaunchpad/plugins/rwnsm/rift/tasklets/rwnsmtasklet/rwnsmplugin.py
rwlaunchpad/plugins/rwnsm/rift/tasklets/rwnsmtasklet/rwnsmtasklet.py
rwlaunchpad/plugins/rwvnfm/rift/tasklets/rwvnfmtasklet/rwvnfmtasklet.py