NgTech-LTD/gns3-server
2
0 Fork 0
mirror of https://github.com/GNS3/gns3-server.git synced 2026-11-03 05:51:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2.2' into 2.3

Browse Source 
# Conflicts:
#	gns3server/notification_queue.py
#	gns3server/version.py
This commit is contained in:
grossmj committed 2020-08-13 01:48:26 +09:30
2 parents 94b27590a7 97e731a7d9
commit 9890126453
10 files changed
+54 -27
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

tests/compute/vpcs/test_vpcs_vm.py
+1 -1
View File
@@ -39,7 +39,7 @@ async def manager(loop, port_manager):
@pytest.fixture(scope="function")
async def vm(loop, compute_project, manager, ubridge_path):
async def vm(loop, compute_project, manager, tmpdir, ubridge_path):
vm = VPCSVM("test", "00010203-0405-0607-0809-0a0b0c0d0e0f", compute_project, manager)
vm._vpcs_version = parse_version("0.9")