gns3-server

mirror of https://github.com/GNS3/gns3-server.git synced 2025-02-23 02:22:36 +00:00

History

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

api

Add user groups support.

2021-05-15 15:10:02 +09:30

compute

Rename __json__() to asdict()

2021-04-17 23:34:28 +09:30

controller

Rename __json__() to asdict()

2021-04-17 23:34:28 +09:30

handlers/api

Merge branch '2.2' into 3.0