Merge remote-tracking branch 'origin/2.2' into 3.0

# Conflicts:
#	gns3server/schemas/iou_template.py
#	tests/handlers/api/compute/test_iou.py
#	tests/handlers/api/controller/test_template.py
This commit is contained in:
grossmj committed 2026-03-12 14:11:05 +08:00
commit 27ce1a4e25
2 files changed
+4 -4

No files matched your search

+1 -1
View File
@@ -264,7 +264,7 @@ def test_create_netmap_config(vm):
@pytest.mark.asyncio
async def test_build_command(vm):
assert await vm._build_command() == [vm.path, str(vm.application_id)]
assert await vm._build_command() == [vm.path, "-n", "256", "-m", "1024", str(vm.application_id)]
def test_get_startup_config(vm):