grossmj 88674455a3 Merge branch '2.1' into 2.2 ...

# Conflicts:
#	gns3server/version.py
#	tests/compute/docker/test_docker_vm.py

2018-03-14 18:40:37 +07:00

..

compute

Merge branch '2.1' into 2.2

2018-03-14 18:40:37 +07:00

controller

Merge 2.1 into 2.2 branch

2018-03-12 13:38:50 +07:00

handlers

Replace asyncio.async with ensure_future because of deprecation, Fixes: #1269

2018-01-24 11:11:53 +01:00

resources

Fix an issue when getting size from some SVG file

2017-02-20 17:25:26 +01:00

topologies

Fix invalid test for 1.3 topology conversion to GNS3 2.1

2017-06-06 16:07:27 +02:00

utils

Cancellable md5sum calculation on thread, Ref. gui#2239

2018-01-29 10:18:13 +01:00

web

Fix tests broken by recent pytest upgrades

2017-01-17 18:56:06 +01:00

__init__.py

Rename vpcs_id to id. Must be an integer in the route definition.

2015-01-18 12:12:11 -07:00

conftest.py

Replace asyncio.async with ensure_future because of deprecation, Fixes: #1269

2018-01-24 11:11:53 +01:00

test_asyncio.py

All current iou code is async

2015-02-16 17:20:07 +01:00

test_config.py

Fix tests about local compute node

2016-08-23 22:40:26 +02:00

test_run.py

Change default port to 3080

2016-03-25 15:31:17 +01:00

test_topologies.py

Change directory layout for dynamips.

2017-01-06 17:43:47 +01:00

test_utils.py

Add tests for checking if path are correctly cleaned

2017-04-18 15:50:11 +02:00

utils.py

Fix tests on python 3.4 (#1046)

2017-05-23 12:15:04 +02:00