Merge branch 'master' into unstable

This commit is contained in:
Julien Duponchelle committed 2015-05-28 12:04:01 +02:00
commit 9442042d7a
16 files changed
+126 -23

No files matched your search

+1 -1
View File
@@ -851,7 +851,7 @@ class Router(BaseVM):
return self._disk1
@asyncio.coroutine
def disk1(self, disk1):
def set_disk1(self, disk1):
"""
Sets the size (MB) for PCMCIA disk1.