Updated Branches:
refs/heads/master 179cdea8e -> e52a4d930
CLOUDSTACK-5572: quicevm won't save memory, as it needs pv driver installed
Conflicts:
engine/storage/src/org/apache/cloudstack/storage/helper/HypervisorHelperImpl.java
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/e52a4d93
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/e52a4d93
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/e52a4d93
Branch: refs/heads/master
Commit: e52a4d93067fde04ac7413463cc962ba1998885e
Parents: 179cdea
Author: Edison Su <sudi...@gmail.com>
Authored: Fri Dec 20 12:36:30 2013 -0800
Committer: Edison Su <sudi...@gmail.com>
Committed: Fri Dec 20 12:36:30 2013 -0800
----------------------------------------------------------------------
.../apache/cloudstack/storage/helper/HypervisorHelperImpl.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e52a4d93/engine/storage/src/org/apache/cloudstack/storage/helper/HypervisorHelperImpl.java
----------------------------------------------------------------------
diff --git
a/engine/storage/src/org/apache/cloudstack/storage/helper/HypervisorHelperImpl.java
b/engine/storage/src/org/apache/cloudstack/storage/helper/HypervisorHelperImpl.java
index 3836c2c..b41c1fa 100644
---
a/engine/storage/src/org/apache/cloudstack/storage/helper/HypervisorHelperImpl.java
+++
b/engine/storage/src/org/apache/cloudstack/storage/helper/HypervisorHelperImpl.java
@@ -111,7 +111,8 @@ public class HypervisorHelperImpl implements
HypervisorHelper {
String value = configurationDao.getValue("vmsnapshot.create.wait");
int wait = NumbersUtil.parseInt(value, 1800);
Long hostId = vmSnapshotHelper.pickRunningHost(virtualMachine.getId());
- VMSnapshotTO vmSnapshotTO = new VMSnapshotTO(1L,
UUID.randomUUID().toString(), VMSnapshot.Type.DiskAndMemory, null, null, false,
null, true);
+ VMSnapshotTO vmSnapshotTO = new VMSnapshotTO(1L,
UUID.randomUUID().toString(), VMSnapshot.Type.Disk, null, null, false,
+ null, true);
GuestOSVO guestOS = guestOSDao.findById(virtualMachine.getGuestOSId());
List<VolumeObjectTO> volumeTOs =
vmSnapshotHelper.getVolumeTOList(virtualMachine.getId());
CreateVMSnapshotCommand ccmd =
