Repository: cloudstack Updated Branches: refs/heads/master 6dc6e8a90 -> 6a5e4306f
fix build Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/6a5e4306 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/6a5e4306 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/6a5e4306 Branch: refs/heads/master Commit: 6a5e4306f2b1720d0ca92013e6424c2d4d8ea9df Parents: 6dc6e8a Author: Edison Su <sudi...@gmail.com> Authored: Thu Oct 9 16:38:23 2014 -0700 Committer: Edison Su <sudi...@gmail.com> Committed: Thu Oct 9 16:38:23 2014 -0700 ---------------------------------------------------------------------- .../src/com/cloud/storage/resource/VmwareStorageProcessor.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6a5e4306/plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareStorageProcessor.java ---------------------------------------------------------------------- diff --git a/plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareStorageProcessor.java b/plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareStorageProcessor.java index f5d2942..1933649 100644 --- a/plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareStorageProcessor.java +++ b/plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareStorageProcessor.java @@ -2183,7 +2183,7 @@ public class VmwareStorageProcessor implements StorageProcessor { backedUpSnapshotUuid = backedUpSnapshotUuid.replace(".ovf", ""); } DatastoreMO primaryDsMo = new DatastoreMO(hyperHost.getContext(), morPrimaryDs); - restoreVolumeFromSecStorage(hyperHost, primaryDsMo, newVolumeName, secondaryStorageUrl, backupPath, backedUpSnapshotUuid); + restoreVolumeFromSecStorage(hyperHost, primaryDsMo, newVolumeName, secondaryStorageUrl, backupPath, backedUpSnapshotUuid, cmd.getWait() * 1000); VolumeObjectTO newVol = new VolumeObjectTO(); newVol.setPath(newVolumeName);
