mirror of
https://github.com/GNS3/gns3-server.git
synced 2026-11-04 14:31:13 +02:00
Merge branch '2.2' into 3.0
# Conflicts: # gns3server/appliances/Simulator.gns3a # gns3server/compute/docker/__init__.py # gns3server/compute/docker/docker_vm.py # gns3server/version.py
This commit is contained in:
commit
296446189f
20 files changed
+187
-99
No files matched your search
@@ -114,7 +114,7 @@ class DockerVM(BaseNode):
|
||||
self._extra_volumes = extra_volumes or []
|
||||
self._memory = memory
|
||||
self._cpus = cpus
|
||||
self._permissions_fixed = False
|
||||
self._permissions_fixed = True
|
||||
self._display = None
|
||||
self._closing = False
|
||||
|
||||
|
||||
Reference in new issue
Block a user