You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ed...@apache.org on 2013/07/25 19:30:07 UTC

git commit: updated refs/heads/4.2 to f350e34

Updated Branches:
  refs/heads/4.2 9db03bf42 -> f350e3457


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/f350e345
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/f350e345
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/f350e345

Branch: refs/heads/4.2
Commit: f350e34574de2b2dfd0943de148cfb7af887b8ae
Parents: 9db03bf
Author: Edison Su <su...@gmail.com>
Authored: Thu Jul 25 10:28:56 2013 -0700
Committer: Edison Su <su...@gmail.com>
Committed: Thu Jul 25 10:29:17 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/f350e345/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);