Merge branch '2.1' into 2.2

# Conflicts:
#	gns3server/schemas/node.py
This commit is contained in:
grossmj committed 2018-03-30 12:14:09 +07:00
commit 669d2ec038
18 files changed
+1952 -15

No files matched your search

@@ -223,7 +223,7 @@ class NodeHandler:
project = yield from Controller.instance().get_loaded_project(request.match_info["project_id"])
node = project.get_node(request.match_info["node_id"])
yield from node.start()
yield from node.start(data=request.json)
response.json(node)
response.set_status(201)