cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From edi...@apache.org
Subject git commit: updated refs/heads/master to 86d919e
Date Thu, 25 Jul 2013 17:32:32 GMT
Updated Branches:
  refs/heads/master 8e72a728b -> 86d919eee


CLOUDSTACK-2481: the wait is in seconds in copycommand


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

Branch: refs/heads/master
Commit: 86d919eee263b93f90e6f5c203853979f7fb9473
Parents: 8e72a72
Author: Edison Su <sudison@gmail.com>
Authored: Thu Jul 25 10:28:56 2013 -0700
Committer: Edison Su <sudison@gmail.com>
Committed: Thu Jul 25 10:32:14 2013 -0700

----------------------------------------------------------------------
 .../cloudstack/storage/resource/NfsSecondaryStorageResource.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/86d919ee/services/secondary-storage/src/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java
----------------------------------------------------------------------
diff --git a/services/secondary-storage/src/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java
b/services/secondary-storage/src/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java
index e6f3092..b6e14b4 100755
--- a/services/secondary-storage/src/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java
+++ b/services/secondary-storage/src/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java
@@ -367,7 +367,7 @@ public class NfsSecondaryStorageResource extends ServerResourceBase implements
S
 
             String templateUuid = UUID.randomUUID().toString();
             String templateName = templateUuid + ".vhd";
-            Script command = new Script(this.createTemplateFromSnapshotXenScript, cmd.getWait(),
s_logger);
+            Script command = new Script(this.createTemplateFromSnapshotXenScript, cmd.getWait()
* 1000, s_logger);
             command.add("-p", snapshotPath);
             command.add("-s", snapshotName);
             command.add("-n", templateName);


Mime
View raw message