ExternalVendorCode/gns3-server
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-server.git synced 2025-06-23 01:08:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch '1.5' into 2.0

Browse Source
This commit is contained in:
Julien Duponchelle
2016-05-10 17:51:40 +02:00
parent a3b243c501 9e2043bfa8
commit 9dca7dfe4a
26 changed files with 345 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gns3server/compute/qemu/qemu_vm.py
View File

@ -30,7 +30,7 @@ import asyncio
import socket
import gns3server
from pkg_resources import parse_version
from gns3server.utils import parse_version
from .qemu_error import QemuError
from ..adapters.ethernet_adapter import EthernetAdapter
from ..nios.nio_udp import NIOUDP