1
0
mirror of https://github.com/GNS3/gns3-server synced 2024-11-24 17:28:08 +00:00
gns3-server/gns3server/controller
grossmj d3860ba84b
Merge branch '2.2' into 3.0
# Conflicts:
#	CHANGELOG
#	dev-requirements.txt
#	gns3server/compute/qemu/__init__.py
#	gns3server/compute/vmware/__init__.py
#	gns3server/controller/snapshot.py
#	gns3server/crash_report.py
#	gns3server/handlers/api/compute/atm_switch_handler.py
#	gns3server/run.py
#	gns3server/static/web-ui/26.77d4bfd104f37c42e028.js
#	gns3server/static/web-ui/index.html
#	gns3server/static/web-ui/runtime.415291667f70565cd8ef.js
#	gns3server/utils/__init__.py
#	gns3server/utils/images.py
#	gns3server/utils/interfaces.py
#	gns3server/version.py
#	gns3server/web/web_server.py
#	pytest.ini
#	requirements.txt
#	scripts/update-bundled-web-ui.sh
#	setup.py
#	tests/api/routes/compute/test_dynamips_nodes.py
#	tests/compute/builtin/nodes/test_cloud.py
#	tests/compute/docker/test_docker.py
#	tests/compute/docker/test_docker_vm.py
#	tests/compute/dynamips/test_dynamips_manager.py
#	tests/compute/dynamips/test_dynamips_router.py
#	tests/compute/iou/test_iou_vm.py
#	tests/compute/qemu/test_qcow2.py
#	tests/compute/qemu/test_qemu_manager.py
#	tests/compute/qemu/test_qemu_vm.py
#	tests/compute/test_base_node.py
#	tests/compute/test_manager.py
#	tests/compute/test_project.py
#	tests/compute/traceng/test_traceng_vm.py
#	tests/compute/virtualbox/test_virtualbox_manager.py
#	tests/compute/virtualbox/test_virtualbox_vm.py
#	tests/compute/vmware/test_vmware_manager.py
#	tests/compute/vmware/test_vmware_vm.py
#	tests/compute/vpcs/test_vpcs_vm.py
#	tests/conftest.py
#	tests/controller/gns3vm/test_remote_gns3_vm.py
#	tests/controller/gns3vm/test_virtualbox_gns3_vm.py
#	tests/controller/gns3vm/test_vmware_gns3_vm.py
#	tests/controller/test_export_project.py
#	tests/controller/test_gns3vm.py
#	tests/controller/test_import_project.py
#	tests/test_config.py
#	tests/utils/test_asyncio.py
#	tests/utils/test_images.py
#	tests/web/test_response.py
2024-05-16 17:53:39 +07:00
..
gns3vm Merge branch '2.2' into 3.0 2023-09-23 15:54:54 +10:00
ports Remove model validator. Fixes https://github.com/GNS3/gns3-gui/issues/3522 2023-10-15 11:16:05 +10:00
__init__.py Merge branch '2.2' into 3.0 2024-03-05 01:05:46 +08:00
appliance_manager.py Merge branch '2.2' into 3.0 2023-09-06 23:30:00 +07:00
appliance_to_template.py Remove Qemu binary requirement 2022-04-19 18:21:39 +07:00
appliance.py Validate appliance files with Pydantic 2021-10-18 21:46:50 +10:30
compute.py Fix warnings in tests 2024-05-09 17:11:12 +07:00
controller_error.py Add missing response() method in ComputeConflictError 2022-05-27 16:03:54 +07:00
drawing.py Rename __json__() to asdict() 2021-04-17 23:34:28 +09:30
export_project.py Merge branch '2.2' into 3.0 2024-03-05 01:05:46 +08:00
import_project.py Make images executable after importing a project 2023-11-23 11:30:46 +10:00
link.py Merge branch 'master' into 3.0 2021-08-29 19:23:51 +09:30
node.py Merge branch '2.2' into 3.0 2023-10-18 17:48:09 +10:00
notification.py Rename __json__() to asdict() 2021-04-17 23:34:28 +09:30
project.py Merge branch '2.2' into 3.0 2024-01-28 12:30:43 +11:00
snapshot.py Merge branch '2.2' into 3.0 2024-05-16 17:53:39 +07:00
symbol_themes.py Merge branch '2.2' into 3.0 2024-04-22 19:08:45 +07:00
symbols.py Fix tests 2023-11-15 11:57:14 +10:00
topology.py Pydantic v2 migration 2023-08-04 18:20:06 +10:00
udp_link.py Merge branch '2.2' into 3.0 2024-05-16 17:53:39 +07:00