Merge branch '2.1' into 2.2

# Conflicts: # gns3server/schemas/node.py
2025-06-19 07:48:10 +00:00 · 2018-03-30 12:14:09 +07:00
parent ff7911bd99 297bbd91ec
commit 669d2ec038
18 changed files with 1952 additions and 15 deletions
--- a/gns3server/controller/link.py
+++ b/gns3server/controller/link.py
@ -417,6 +417,7 @@ class Link:
        """
        for node in self._nodes:
            if node["node"].node_type in ('vpcs',
+                                          'traceng',
                                          'vmware',
                                          'dynamips',
                                          'qemu',