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
@@ -131,7 +131,7 @@ class IOUVM(BaseNode):
self._path = self.manager.get_abs_image_path(path)
# In 1.2 users uploaded images to the images roots
# after the migration their images are inside images/IOU
# after the migration their images are inside images/IOU
# but old topologies use old path
if "IOU" not in self._path:
location, filename = os.path.split(self._path)