grossmj a324459152 Merge branch '2.2' into 3.0 ...

# Conflicts:
#	gns3server/compute/qemu/qemu_vm.py
#	gns3server/handlers/api/compute/server_handler.py
#	gns3server/utils/path.py
#	gns3server/version.py
#	requirements.txt
#	tests/compute/qemu/test_qemu_vm.py
#	tests/compute/test_manager.py

2021-09-09 16:36:17 +09: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

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

Merge branch '2.2' into 3.0

2021-09-09 16:36:17 +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

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

Fix binary websocket access to the console

2021-07-26 12:58:35 +02:00

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