Merge branch '1.5' into 2.0

This commit is contained in:
Julien Duponchelle
2016-05-10 17:51:40 +02:00
26 changed files with 345 additions and 66 deletions

View File

@ -22,7 +22,7 @@ import os
import sys
from tests.utils import asyncio_patch
from pkg_resources import parse_version
from gns3server.utils import parse_version
from unittest.mock import patch, MagicMock
from gns3server.compute.vpcs.vpcs_vm import VPCSVM