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

author	Philip Joseph <philip.joseph@riftio.com>
	Fri, 7 Apr 2017 09:53:26 +0000 (09:53 +0000)
committer	Philip Joseph <philip.joseph@riftio.com>
	Fri, 7 Apr 2017 09:53:26 +0000 (09:53 +0000)
commit	a3bb91f092d378448cb870eccd45d43865de143c
tree	fa92ffd38f5a12b2ff85aea9955e8439cb2b57b6	tree \| snapshot
parent	cd455eba9834532e57a661e41cd5864afc90ddec	commit \| diff
parent	5a660df2c93308dc82a1bd31b8eb000558910ee9	commit \| diff

Merge from OSM SO master

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

27 files changed:

BUILD.sh	diff1 \|	diff2 \|	blob \| history
common/plugins/yang/CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
common/plugins/yang/rw-sdn.yang	diff1 \|	diff2 \|	blob \| history
common/python/CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
common/python/rift/mano/sdn/config.py	\|	diff2 \|	blob \| history
common/python/rift/mano/sdn/operdata.py	\|	diff2 \|	blob \| history
models/openmano/python/rift/openmano/rift2openmano.py	diff1 \|	diff2 \|	blob \| history
models/plugins/yang/CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
models/plugins/yang/mano-types.yang	diff1 \|	diff2 \|	blob \| history
models/plugins/yang/nsr.yang	diff1 \|	diff2 \|	blob \| history
models/plugins/yang/pnfd.yang	diff1 \|	diff2 \|	blob \| history
models/plugins/yang/vlr.yang	diff1 \|	diff2 \|	blob \| history
rwcal/plugins/yang/rwcal.yang	diff1 \|	diff2 \|	blob \| history
rwcm/plugins/rwconman/rift/tasklets/rwconmantasklet/rwconman_config.py	diff1 \|	diff2 \|	blob \| history
rwlaunchpad/plugins/cli/cli_launchpad_schema_listing.txt	diff1 \|	diff2 \|	blob \| history
rwlaunchpad/plugins/rwnsm/rift/tasklets/rwnsmtasklet/openmano_nsm.py	diff1 \|	diff2 \|	blob \| history
rwlaunchpad/plugins/rwnsm/rift/tasklets/rwnsmtasklet/rwnsmtasklet.py	diff1 \|	diff2 \|	blob \| history
rwlaunchpad/plugins/rwnsm/rift/tasklets/rwnsmtasklet/rwvnffgmgr.py	diff1 \|	diff2 \|	blob \| history
rwlaunchpad/plugins/rwpkgmgr/rift/tasklets/rwpkgmgr/rpc.py	diff1 \|	diff2 \|	blob \| history
rwlaunchpad/plugins/rwpkgmgr/rift/tasklets/rwpkgmgr/rwpkgmgr.py	diff1 \|	diff2 \|	blob \| history
rwlaunchpad/plugins/rwvns/rift/tasklets/rwvnstasklet/rwvnstasklet.py	diff1 \|	diff2 \|	blob \| history
rwlaunchpad/plugins/rwvns/rift/topmgr/rwtopmgr.py	diff1 \|	diff2 \|	blob \| history
rwlaunchpad/plugins/rwvns/vala/CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
rwlaunchpad/plugins/rwvns/yang/CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
rwlaunchpad/plugins/rwvns/yang/rwsdnal.yang	\|	diff2 \|	blob \| history
rwlaunchpad/plugins/yang/rw-pkg-mgmt.yang	diff1 \|	diff2 \|	blob \| history
rwlaunchpad/plugins/yang/rw-vns.yang	diff1 \|	diff2 \|	blob \| history

RSS Atom

BUILD.sh	diff1 \|	diff2 \|	blob \| history
common/plugins/yang/CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
common/plugins/yang/rw-sdn.yang	diff1 \|	diff2 \|	blob \| history
common/python/CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
common/python/rift/mano/sdn/config.py	\|	diff2 \|	blob \| history
common/python/rift/mano/sdn/operdata.py	\|	diff2 \|	blob \| history
models/openmano/python/rift/openmano/rift2openmano.py	diff1 \|	diff2 \|	blob \| history
models/plugins/yang/CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
models/plugins/yang/mano-types.yang	diff1 \|	diff2 \|	blob \| history
models/plugins/yang/nsr.yang	diff1 \|	diff2 \|	blob \| history
models/plugins/yang/pnfd.yang	diff1 \|	diff2 \|	blob \| history
models/plugins/yang/vlr.yang	diff1 \|	diff2 \|	blob \| history
rwcal/plugins/yang/rwcal.yang	diff1 \|	diff2 \|	blob \| history
rwcm/plugins/rwconman/rift/tasklets/rwconmantasklet/rwconman_config.py	diff1 \|	diff2 \|	blob \| history
rwlaunchpad/plugins/cli/cli_launchpad_schema_listing.txt	diff1 \|	diff2 \|	blob \| history
rwlaunchpad/plugins/rwnsm/rift/tasklets/rwnsmtasklet/openmano_nsm.py	diff1 \|	diff2 \|	blob \| history
rwlaunchpad/plugins/rwnsm/rift/tasklets/rwnsmtasklet/rwnsmtasklet.py	diff1 \|	diff2 \|	blob \| history
rwlaunchpad/plugins/rwnsm/rift/tasklets/rwnsmtasklet/rwvnffgmgr.py	diff1 \|	diff2 \|	blob \| history
rwlaunchpad/plugins/rwpkgmgr/rift/tasklets/rwpkgmgr/rpc.py	diff1 \|	diff2 \|	blob \| history
rwlaunchpad/plugins/rwpkgmgr/rift/tasklets/rwpkgmgr/rwpkgmgr.py	diff1 \|	diff2 \|	blob \| history
rwlaunchpad/plugins/rwvns/rift/tasklets/rwvnstasklet/rwvnstasklet.py	diff1 \|	diff2 \|	blob \| history
rwlaunchpad/plugins/rwvns/rift/topmgr/rwtopmgr.py	diff1 \|	diff2 \|	blob \| history
rwlaunchpad/plugins/rwvns/vala/CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
rwlaunchpad/plugins/rwvns/yang/CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
rwlaunchpad/plugins/rwvns/yang/rwsdnal.yang	\|	diff2 \|	blob \| history
rwlaunchpad/plugins/yang/rw-pkg-mgmt.yang	diff1 \|	diff2 \|	blob \| history
rwlaunchpad/plugins/yang/rw-vns.yang	diff1 \|	diff2 \|	blob \| history