merge master and fix SDN chaining unit test
authorstevenvanrossem <steven.vanrossem@intec.ugent.be>
Wed, 11 May 2016 21:51:06 +0000 (23:51 +0200)
committerstevenvanrossem <steven.vanrossem@intec.ugent.be>
Wed, 11 May 2016 21:51:06 +0000 (23:51 +0200)
commite3e034e3124ea755e924dc667fd1232323cff70c
treeb135b233a25a4e5e92a973027c9a9da67513179a
parent241e3e951c4871d956c29887ab101adce4817363
merge master and fix SDN chaining unit test
26 files changed:
LICENSE [changed mode: 0644->0755]
misc/sonata-demo-docker.son [changed mode: 0644->0755]
setup.cfg [changed mode: 0644->0755]
setup.py [changed mode: 0644->0755]
src/emuvim/__init__.py [changed mode: 0644->0755]
src/emuvim/api/openstack/README.md [changed mode: 0644->0755]
src/emuvim/api/sonata/README.md [changed mode: 0644->0755]
src/emuvim/api/sonata/__init__.py [changed mode: 0644->0755]
src/emuvim/api/zerorpc/__init__.py [changed mode: 0644->0755]
src/emuvim/api/zerorpc/compute.py [changed mode: 0644->0755]
src/emuvim/api/zerorpc/network.py [changed mode: 0644->0755]
src/emuvim/conftest.py [changed mode: 0644->0755]
src/emuvim/dcemulator/resourcemodel/__init__.py [changed mode: 0644->0755]
src/emuvim/dcemulator/resourcemodel/upb/__init__.py [changed mode: 0644->0755]
src/emuvim/dcemulator/resourcemodel/upb/simple.py [changed mode: 0644->0755]
src/emuvim/examples/resource_model_demo_topology.py [changed mode: 0644->0755]
src/emuvim/examples/sonata_y1_demo_topology_1.py [changed mode: 0644->0755]
src/emuvim/test/__init__.py [changed mode: 0644->0755]
src/emuvim/test/base.py [changed mode: 0644->0755]
src/emuvim/test/integrationtests/__init__.py [changed mode: 0644->0755]
src/emuvim/test/unittests/__init__.py [changed mode: 0644->0755]
src/emuvim/test/unittests/test_emulator.py
src/emuvim/test/unittests/test_resourcemodel.py [changed mode: 0644->0755]
src/emuvim/test/unittests/test_sonata_dummy_gatekeeper.py [changed mode: 0644->0755]
utils/ci/junit-xml/.gitkeep [changed mode: 0644->0755]
utils/docker/Dockerfile [changed mode: 0644->0755]