Merge branch '1.5' into 2.0

This commit is contained in:
Julien Duponchelle committed 2016-05-18 11:25:41 +02:00
commit d5895c3a47
22 files changed
+65 -53

No files matched your search

+1 -1
View File
@@ -218,7 +218,7 @@ class Dynamips(BaseManager):
continue
# Release the dynamips ids if we want to reload the same project
# later
# later
if project.id in self._dynamips_ids:
del self._dynamips_ids[project.id]