Merge branch '2.2' into 3.0

Browse Source

# 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

...

This commit is contained in:

grossmj committed 2021-05-15 20:46:34 +09:30

2 parents e86d8f96ca 3a479d7ea6

commit 09ac7fd7fb

12 files changed

+599 -3

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

tests/handlers/api/controller/test_node.py

Whitespace-only changes.

tests/handlers/api/controller/test_project.py

Whitespace-only changes.