Merge remote-tracking branch 'origin/master' into 2.1

This commit is contained in:
Julien Duponchelle committed 2017-06-19 10:44:52 +02:00
commit bb8097a052
16 files changed
+95 -13

No files matched your search

@@ -46,4 +46,3 @@ def test_put_gns3vm(http_controller):
def test_get_gns3vm(http_controller):
response = http_controller.get('/gns3vm', example=True)
assert response.status == 200
print(response.json)