You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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		3 years ago
..
api	Add user groups support.	3 years ago
compute	Rename __json__() to asdict()	3 years ago
controller	Rename __json__() to asdict()	3 years ago
handlers/api	Merge branch '2.2' into 3.0	3 years ago
resources	…
topologies	Fix tests. Ref #1659	5 years ago
utils	Generate new config for each test. Fixes tests.	3 years ago
web	Merge branch 'master' into 3.0	3 years ago
__init__.py	…
conftest.py	Fix issues with latest version of sqlalchemy	3 years ago
test_config.py	Rename ssl and auth configuration file settings.	3 years ago
test_server.py	Rename ssl and auth configuration file settings.	3 years ago
test_topologies.py	Fix topology test	5 years ago
test_utils.py	Refactor tests	4 years ago
utils.py	Refactor tests	4 years ago