NgTech-LTD/gns3-server
2
0 Fork 0
mirror of https://github.com/GNS3/gns3-server.git synced 2026-11-04 06:21:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2.0' into 2.1

Browse Source
This commit is contained in:
Julien Duponchelle committed 2017-05-15 15:46:50 +02:00
2 parents 633cdef0bc 851d6e1db8
commit cd17ef6b12
34 files changed
+221 -74
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

gns3server/controller/__init__.py
+1 -1
View File
@@ -160,7 +160,7 @@ class Controller:
for c in computes:
try:
yield from self.add_compute(**c)
except (aiohttp.web_exceptions.HTTPConflict):
except (aiohttp.web_exceptions.HTTPConflict, KeyError):
pass # Skip not available servers at loading
yield from self.load_projects()
try: