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

author	Philip Joseph <philip.joseph@riftio.com>
	Fri, 31 Mar 2017 19:35:56 +0000 (01:05 +0530)
committer	Philip Joseph <philip.joseph@riftio.com>
	Fri, 31 Mar 2017 19:35:56 +0000 (01:05 +0530)
commit	9ad945aab0b5a992e1df860bede8ecc9b143470e
tree	8aa40a00929161c98d53b2b340e4e2b7ce3dd7a8	tree \| snapshot
parent	49ab225e68fea4f63a26657bfacd622862ade597	commit \| diff
parent	7295f64eb5dd9d75b1dd272567c99304b65a7d0a	commit \| diff

Merge from master

Signed-off-by: Philip Joseph <philip.joseph@riftio.com>

27 files changed:

BUILD.sh	diff1 \|	diff2 \|	blob \| history
common/python/CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
common/python/rift/mano/config_agent/operdata.py	diff1 \|	diff2 \|	blob \| history
common/python/rift/mano/tosca_translator/rwmano/tosca/tosca_nfv_vnf.py	diff1 \|	diff2 \|	blob \| history
common/python/rift/mano/yang_translator/rwmano/yang/yang_nsd.py	diff1 \|	diff2 \|	blob \| history
models/openmano/python/rift/openmano/rift2openmano.py	diff1 \|	diff2 \|	blob \| history
models/plugins/yang/mano-types.yang	diff1 \|	diff2 \|	blob \| history
models/plugins/yang/nsd-base.yang	diff1 \|	\|	blob \| history
models/plugins/yang/nsd.yang	diff1 \|	diff2 \|	blob \| history
models/plugins/yang/nsr.yang	diff1 \|	diff2 \|	blob \| history
models/plugins/yang/project-nsd.yang	diff1 \|	\|	blob \| history
models/plugins/yang/vnfr.yang	diff1 \|	diff2 \|	blob \| history
rwcm/plugins/rwconman/rift/tasklets/rwconmantasklet/rwconman_config.py	diff1 \|	diff2 \|	blob \| history
rwlaunchpad/plugins/rwimagemgr/rift/tasklets/rwimagemgr/upload.py	diff1 \|	diff2 \|	blob \| history
rwlaunchpad/plugins/rwlaunchpadtasklet/rift/package/store.py	diff1 \|	diff2 \|	blob \| history
rwlaunchpad/plugins/rwlaunchpadtasklet/rift/tasklets/rwlaunchpad/export.py	diff1 \|	diff2 \|	blob \| history
rwlaunchpad/plugins/rwlaunchpadtasklet/rift/tasklets/rwlaunchpad/image.py	diff1 \|	diff2 \|	blob \| history
rwlaunchpad/plugins/rwlaunchpadtasklet/scripts/onboard_pkg	diff1 \|	diff2 \|	blob \| history
rwlaunchpad/plugins/rwnsm/rift/tasklets/rwnsmtasklet/rwnsmtasklet.py	diff1 \|	diff2 \|	blob \| history
rwlaunchpad/plugins/rwpkgmgr/rift/tasklets/rwpkgmgr/publisher/download_status.py	diff1 \|	diff2 \|	blob \| history
rwlaunchpad/plugins/rwpkgmgr/rift/tasklets/rwpkgmgr/rwpkgmgr.py	diff1 \|	diff2 \|	blob \| history
rwlaunchpad/plugins/rwpkgmgr/rift/tasklets/rwpkgmgr/subscriber/download_status.py	diff1 \|	diff2 \|	blob \| history
rwlaunchpad/plugins/rwresmgr/rift/tasklets/rwresmgrtasklet/rwresmgrtasklet.py	diff1 \|	diff2 \|	blob \| history
rwlaunchpad/plugins/rwvnfm/rift/tasklets/rwvnfmtasklet/rwvnfmtasklet.py	diff1 \|	diff2 \|	blob \| history
rwlaunchpad/plugins/rwvns/vala/CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
rwlaunchpad/plugins/rwvns/yang/rwsdn.yang	diff1 \|	diff2 \|	blob \| history
rwlaunchpad/plugins/yang/rw-pkg-mgmt.yang	diff1 \|	diff2 \|	blob \| history

RSS Atom

BUILD.sh	diff1 \|	diff2 \|	blob \| history
common/python/CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
common/python/rift/mano/config_agent/operdata.py	diff1 \|	diff2 \|	blob \| history
common/python/rift/mano/tosca_translator/rwmano/tosca/tosca_nfv_vnf.py	diff1 \|	diff2 \|	blob \| history
common/python/rift/mano/yang_translator/rwmano/yang/yang_nsd.py	diff1 \|	diff2 \|	blob \| history
models/openmano/python/rift/openmano/rift2openmano.py	diff1 \|	diff2 \|	blob \| history
models/plugins/yang/mano-types.yang	diff1 \|	diff2 \|	blob \| history
models/plugins/yang/nsd-base.yang	diff1 \|	\|	blob \| history
models/plugins/yang/nsd.yang	diff1 \|	diff2 \|	blob \| history
models/plugins/yang/nsr.yang	diff1 \|	diff2 \|	blob \| history
models/plugins/yang/project-nsd.yang	diff1 \|	\|	blob \| history
models/plugins/yang/vnfr.yang	diff1 \|	diff2 \|	blob \| history
rwcm/plugins/rwconman/rift/tasklets/rwconmantasklet/rwconman_config.py	diff1 \|	diff2 \|	blob \| history
rwlaunchpad/plugins/rwimagemgr/rift/tasklets/rwimagemgr/upload.py	diff1 \|	diff2 \|	blob \| history
rwlaunchpad/plugins/rwlaunchpadtasklet/rift/package/store.py	diff1 \|	diff2 \|	blob \| history
rwlaunchpad/plugins/rwlaunchpadtasklet/rift/tasklets/rwlaunchpad/export.py	diff1 \|	diff2 \|	blob \| history
rwlaunchpad/plugins/rwlaunchpadtasklet/rift/tasklets/rwlaunchpad/image.py	diff1 \|	diff2 \|	blob \| history
rwlaunchpad/plugins/rwlaunchpadtasklet/scripts/onboard_pkg	diff1 \|	diff2 \|	blob \| history
rwlaunchpad/plugins/rwnsm/rift/tasklets/rwnsmtasklet/rwnsmtasklet.py	diff1 \|	diff2 \|	blob \| history
rwlaunchpad/plugins/rwpkgmgr/rift/tasklets/rwpkgmgr/publisher/download_status.py	diff1 \|	diff2 \|	blob \| history
rwlaunchpad/plugins/rwpkgmgr/rift/tasklets/rwpkgmgr/rwpkgmgr.py	diff1 \|	diff2 \|	blob \| history
rwlaunchpad/plugins/rwpkgmgr/rift/tasklets/rwpkgmgr/subscriber/download_status.py	diff1 \|	diff2 \|	blob \| history
rwlaunchpad/plugins/rwresmgr/rift/tasklets/rwresmgrtasklet/rwresmgrtasklet.py	diff1 \|	diff2 \|	blob \| history
rwlaunchpad/plugins/rwvnfm/rift/tasklets/rwvnfmtasklet/rwvnfmtasklet.py	diff1 \|	diff2 \|	blob \| history
rwlaunchpad/plugins/rwvns/vala/CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
rwlaunchpad/plugins/rwvns/yang/rwsdn.yang	diff1 \|	diff2 \|	blob \| history
rwlaunchpad/plugins/yang/rw-pkg-mgmt.yang	diff1 \|	diff2 \|	blob \| history