Merge branch '2.2' into 3.0

Browse Source

# Conflicts:
#	gns3server/compute/qemu/qemu_vm.py
#	gns3server/handlers/api/compute/qemu_handler.py
#	gns3server/handlers/api/controller/symbol_handler.py
#	gns3server/version.py
#	tests/compute/qemu/test_qemu_vm.py
#	tests/endpoints/compute/test_qemu_nodes.py
#	tests/endpoints/controller/test_nodes.py

...

This commit is contained in:

grossmj committed 2020-10-12 18:04:49 +10:30

2 parents eb3cb8a41f 362701f5aa

commit 0746949207

162 files changed

+34333 -50289

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

gns3server/handlers/api/compute/qemu_handler.py

Whitespace-only changes.