1
0
mirror of https://github.com/GNS3/gns3-server synced 2024-12-26 00:38:10 +00:00
gns3-server/gns3server/compute/dynamips
grossmj 802959f9ab Merge branch 'master' into 3.0
# Conflicts:
#	dev-requirements.txt
#	gns3server/controller/__init__.py
#	gns3server/controller/appliance_manager.py
#	gns3server/controller/compute.py
#	gns3server/controller/topology.py
#	gns3server/handlers/api/compute/ethernet_switch_handler.py
#	gns3server/handlers/api/controller/link_handler.py
#	gns3server/handlers/api/controller/symbol_handler.py
#	gns3server/version.py
#	requirements.txt
#	tests/controller/test_export_project.py
#	tests/handlers/api/compute/test_qemu.py
#	tests/web/test_response.py
#	win-requirements.txt
2021-04-10 12:46:40 +09:30
..
adapters Rename hypervisor to compute 2016-04-15 17:59:59 +02:00
nios Fix remote packet capture for Dynamips. 2019-04-01 20:58:18 +07:00
nodes Merge branch 'master' into 3.0 2021-04-10 12:46:40 +09:30
__init__.py Add HTTP client to reuse the aiohttp session where needed. 2020-10-22 16:19:44 +10:30
dynamips_error.py Raise an error if image is missing on compute 2016-06-07 15:34:04 +02:00
dynamips_factory.py Fix trouble with builtin devices when we free ports 2016-12-12 19:17:06 +01:00
dynamips_hypervisor.py Drop Python 3.4 and switch to async / await syntax for asyncio. Fixes #1425 2018-10-15 17:05:49 +07:00
hypervisor.py Drop Python 3.4 and switch to async / await syntax for asyncio. Fixes #1425 2018-10-15 17:05:49 +07:00