cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bhais...@apache.org
Subject [26/50] [abbrv] git commit: updated refs/heads/master to 7072d8d
Date Thu, 16 Oct 2014 13:25:58 GMT
fix build

(cherry picked from commit 6a5e4306f2b1720d0ca92013e6424c2d4d8ea9df)


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/52c6c90e
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/52c6c90e
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/52c6c90e

Branch: refs/heads/master
Commit: 52c6c90eda6591c0fd260088b23bd21c445f1e98
Parents: 27924d1
Author: Edison Su <sudison@gmail.com>
Authored: Thu Oct 9 16:38:23 2014 -0700
Committer: David Nalley <david@gnsa.us>
Committed: Mon Oct 13 00:38:40 2014 -0400

----------------------------------------------------------------------
 .../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/52c6c90e/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);


Mime
View raw message