1
0
mirror of https://github.com/GNS3/gns3-server synced 2024-12-30 18:50:58 +00:00
gns3-server/gns3server
grossmj 8ce0cbf7f7
Merge branch '2.2' into 3.0
# Conflicts:
#	gns3server/compute/base_node.py
#	gns3server/compute/docker/docker_vm.py
#	gns3server/compute/dynamips/nodes/c1700.py
#	gns3server/compute/dynamips/nodes/c2600.py
#	gns3server/compute/dynamips/nodes/c2691.py
#	gns3server/compute/dynamips/nodes/c3600.py
#	gns3server/compute/dynamips/nodes/c3725.py
#	gns3server/compute/dynamips/nodes/c3745.py
#	gns3server/compute/dynamips/nodes/c7200.py
#	gns3server/compute/dynamips/nodes/router.py
#	gns3server/compute/qemu/qemu_vm.py
#	gns3server/controller/node.py
#	gns3server/controller/topology.py
#	gns3server/handlers/api/compute/docker_handler.py
#	gns3server/handlers/api/compute/dynamips_vm_handler.py
#	gns3server/handlers/api/compute/qemu_handler.py
#	gns3server/schemas/docker.py
#	gns3server/schemas/docker_template.py
#	gns3server/schemas/dynamips_template.py
#	gns3server/schemas/dynamips_vm.py
#	gns3server/schemas/node.py
#	gns3server/schemas/qemu.py
#	gns3server/schemas/qemu_template.py
2024-09-23 13:28:56 +07:00
..
api Fix MAC address support for Docker containers 2024-09-18 18:02:35 +07:00
appliances Sync appliances 2024-08-06 12:34:07 +02:00
compute Revert "Backport auxiliary console support for Qemu, Docker and Dynamips nodes" 2024-09-23 13:10:58 +07:00
config_samples Fix to access resources_path and install_builtin_appliances settings 2024-07-09 12:28:39 +02:00
configs Update IOU base configs to use "no ip domain lookup". Fixes #2404 2024-07-22 19:07:17 +02:00
controller Merge branch '2.2' into 3.0 2024-09-23 13:28:56 +07:00
core Option to disable image discovery and do not scan parent directory 2022-12-26 12:32:40 +08:00
db Fix MAC address support for Docker containers 2024-09-18 18:02:35 +07:00
db_migrations Fix MAC address support for Docker containers 2024-09-18 18:02:35 +07:00
disks Merge branch '2.2' into 3.0 2023-07-13 10:09:26 +10:00
schemas Revert "Backport auxiliary console support for Qemu, Docker and Dynamips nodes" 2024-09-23 13:10:58 +07:00
services Replace deprecated method datetime.utcnow() 2024-05-18 23:33:26 +07:00
static Downgrade aiohttp to v3.9.5 2024-08-11 11:22:20 -06:00
symbols Add NAT symbols 2024-04-22 18:51:29 +07:00
templates Move to version 3 of the REST API. 2020-11-02 12:05:32 +10:30
utils Convert topologies < 3.0 to have valid node hostnames 2024-07-20 17:22:24 +02:00
__init__.py Use pyupgrade with --py36-plus param. 2021-04-13 18:37:58 +09:30
__main__.py
alembic.ini Support for database schema migrations using alembic 2023-01-11 10:15:04 +08:00
config.py Use controller vars file to store version and appliance etag 2023-09-06 16:28:46 +07:00
crash_report.py Release v3.0.0rc1 2024-08-11 11:35:19 -06:00
logger.py Drop Windows support 2022-01-19 22:28:36 +10:30
main.py Support for cooperative signal handling of uvicorn v0.29.0 2024-04-03 15:58:10 +07:00
server.py Support for cooperative signal handling of uvicorn v0.29.0 2024-04-03 15:58:10 +07:00
version.py Release v3.0.0rc1 2024-08-11 11:35:19 -06:00