mirror of
https://github.com/GNS3/gns3-server.git
synced 2024-12-23 14:42:28 +00:00
Merge branch '2.2' into 3.0
# Conflicts: # appveyor.yml # gns3server/compute/project_manager.py # gns3server/handlers/api/controller/node_handler.py # gns3server/static/web-ui/index.html # gns3server/static/web-ui/main.febf2f1259a67875a3e3.js
This commit is contained in:
commit
13630179b2
@ -102,6 +102,9 @@ default_nat_interface = vmnet10
|
|||||||
; Enable the built-in templates
|
; Enable the built-in templates
|
||||||
enable_builtin_templates = True
|
enable_builtin_templates = True
|
||||||
|
|
||||||
|
; check if hardware virtualization is used by other emulators (KVM, VMware or VirtualBox)
|
||||||
|
hardware_virtualization_check = True
|
||||||
|
|
||||||
[VPCS]
|
[VPCS]
|
||||||
; VPCS executable location, default: search in PATH
|
; VPCS executable location, default: search in PATH
|
||||||
;vpcs_path = vpcs
|
;vpcs_path = vpcs
|
||||||
|
Loading…
Reference in New Issue
Block a user