Merge branch 'master' into 2.0

This commit is contained in:
Julien Duponchelle committed 2016-08-29 14:08:23 +02:00
commit 72fe5d3489
14 files changed
+314 -30

No files matched your search

+1 -1
View File
@@ -128,7 +128,7 @@ class GNS3VM:
"""
The GNSVM is activated
"""
return self._settings["enable"]
return self._settings.get("enable", False)
@property
def auto_stop(self):