grossmj 09ac7fd7fb Merge branch '2.2' into 3.0 ... # Conflicts: # gns3server/compute/base_manager.py # gns3server/handlers/api/compute/dynamips_vm_handler.py # gns3server/handlers/api/compute/iou_handler.py # gns3server/handlers/api/compute/project_handler.py # gns3server/handlers/api/compute/qemu_handler.py # gns3server/handlers/api/controller/node_handler.py # gns3server/handlers/api/controller/project_handler.py # gns3server/handlers/index_handler.py # tests/handlers/api/compute/test_project.py # tests/handlers/api/compute/test_qemu.py # tests/handlers/api/controller/test_node.py # tests/handlers/api/controller/test_project.py		2021-05-15 20:46:34 +09:30
..
adapters	Use pyupgrade with --py36-plus param.	2021-04-13 18:37:58 +09:30
builtin	Rename __json__() to asdict()	2021-04-17 23:34:28 +09:30
docker	Rename __json__() to asdict()	2021-04-17 23:34:28 +09: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	Rename __json__() to asdict()	2021-04-17 23:34:28 +09: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	Rename __json__() to asdict()	2021-04-17 23:34:28 +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 '2.2' into 3.0	2021-05-15 20:46:34 +09:30
base_node.py	Use black with -l 120 param.	2021-04-13 18:46:50 +09: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