From: stevenvanrossem <steven.vanrossem@intec.ugent.be>
Date: Fri, 3 Feb 2017 15:42:51 +0000 (+0100)
Subject: Merge branch 'master' of github.com:stevenvanrossem/son-emu
X-Git-Tag: v3.1~45^2~12
X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2Fvim-emu.git;a=commitdiff_plain;h=f20404dcbfb68cf29baa00e8f89dd50265ea3b1f

Merge branch 'master' of github.com:stevenvanrossem/son-emu

Conflicts:
	src/emuvim/api/rest/network.py
---

f20404dcbfb68cf29baa00e8f89dd50265ea3b1f
diff --cc src/emuvim/api/rest/monitor.py
index 209670c,6f99bdf..379c8d5
--- a/src/emuvim/api/rest/monitor.py
+++ b/src/emuvim/api/rest/monitor.py
@@@ -211,10 -211,10 +211,10 @@@ class MonitorLinkAction(Resource)
                  c2 = net.monitor_agent.stop_flow(vnf_name, vnf_interface, metric, cookie)
  
              # return setChain response
-             return (str(c1) + " " + str(c2)), 200
+             return (str(c1) + " " + str(c2)), 200, CORS_HEADER
          except Exception as ex:
              logging.exception("API error.")
 -            return ex.message, 500
 +            return ex.message, 500, CORS_HEADER
  
  class MonitorSkewAction(Resource):
      """