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

author	Philip Joseph <philip.joseph@riftio.com>
	Wed, 11 Jan 2017 16:49:14 +0000 (16:49 +0000)
committer	Philip Joseph <philip.joseph@riftio.com>
	Wed, 11 Jan 2017 16:49:14 +0000 (16:49 +0000)
commit	12021c59a748f44dc4bd01b2b5edf5dc6047357b
tree	253ae8bcbd5a7bfdf57e66cc3d60e1ac97fd70d7	tree \| snapshot
parent	8af176ef1a053a394ce2d3acb94dc6b564049c09	commit \| diff
parent	97467c2ec5f6ea2a2e64e59a8a4d2a65714c178c	commit \| diff

Merge from master

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

common/python/CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
examples/ping_pong_ns/CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
examples/ping_pong_ns/rift/mano/examples/ping_pong_nsd.py	diff1 \|	diff2 \|	blob \| history
models/plugins/yang/mano-types.yang	diff1 \|	diff2 \|	blob \| history
models/plugins/yang/nsd.yang	diff1 \|	diff2 \|	blob \| history
models/plugins/yang/vnfd.yang	diff1 \|	diff2 \|	blob \| history
models/plugins/yang/vnfr.yang	diff1 \|	diff2 \|	blob \| history
rwcm/plugins/rwconman/rift/tasklets/rwconmantasklet/rwconman_config.py	diff1 \|	diff2 \|	blob \| history
rwcm/plugins/rwconman/rift/tasklets/rwconmantasklet/rwconmantasklet.py	diff1 \|	diff2 \|	blob \| history
rwlaunchpad/plugins/rwvnfm/rift/tasklets/rwvnfmtasklet/rwvnfmtasklet.py	diff1 \|	diff2 \|	blob \| history