grossmj 296446189f Merge branch '2.2' into 3.0 ... # Conflicts: # gns3server/appliances/Simulator.gns3a # gns3server/compute/docker/__init__.py # gns3server/compute/docker/docker_vm.py # gns3server/version.py		2021-12-02 19:57:04 +10:30
..
adapters	Use pyupgrade with --py36-plus param.	2021-04-13 18:37:58 +09:30
builtin	Fix tests	2021-08-30 13:04:24 +09:30
docker	Merge branch '2.2' into 3.0	2021-12-02 19:57:04 +10:30
dynamips	Rename __json__() to asdict()	2021-04-17 23:34:28 +09:30
iou	Rename __json__() to asdict()	2021-04-17 23:34:28 +09:30
nios	Rename __json__() to asdict()	2021-04-17 23:34:28 +09:30
qemu	Remove Qemu legacy networking support	2021-10-19 15:32:27 +10:30
ubridge	Use black with -l 120 param.	2021-04-13 18:46:50 +09:30
virtualbox	Rename __json__() to asdict()	2021-04-17 23:34:28 +09:30
vmware	Merge branch '2.2' into 3.0	2021-08-10 15:38:49 +09:30
vpcs	Rename __json__() to asdict()	2021-04-17 23:34:28 +09:30
__init__.py	Remove traceng code.	2021-04-13 19:03:23 +09:30
base_manager.py	Merge branch 'master' into 3.0	2021-08-29 19:23:51 +09:30
base_node.py	Merge branch 'master' into 3.0	2021-10-09 12:16:50 +10:30
compute_error.py	Use black with -l 120 param.	2021-04-13 18:46:50 +09:30
error.py	Use black with -l 120 param.	2021-04-13 18:46:50 +09:30
notification_manager.py	Use black with -l 120 param.	2021-04-13 18:46:50 +09:30
port_manager.py	Rename __json__() to asdict()	2021-04-17 23:34:28 +09:30
project_manager.py	Move schemas between compute and controller subpackages	2021-04-15 18:12:08 +09:30
project.py	Rename __json__() to asdict()	2021-04-17 23:34:28 +09:30