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 51c1410
Date Fri, 18 Jul 2014 19:08:46 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/master 9fb93fe5b -> 51c14106d


CLOUDSTACK-7123: set the timeout to 60s, when run the file command


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

Branch: refs/heads/master
Commit: 51c14106d8858769ac8f3cc0d8f3f357254c0509
Parents: 9fb93fe
Author: Edison Su <sudison@gmail.com>
Authored: Fri Jul 18 12:07:36 2014 -0700
Committer: Edison Su <sudison@gmail.com>
Committed: Fri Jul 18 12:07:36 2014 -0700

----------------------------------------------------------------------
 utils/src/org/apache/cloudstack/utils/template/TemplateUtils.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/51c14106/utils/src/org/apache/cloudstack/utils/template/TemplateUtils.java
----------------------------------------------------------------------
diff --git a/utils/src/org/apache/cloudstack/utils/template/TemplateUtils.java b/utils/src/org/apache/cloudstack/utils/template/TemplateUtils.java
index bad94de..a3f3a68 100644
--- a/utils/src/org/apache/cloudstack/utils/template/TemplateUtils.java
+++ b/utils/src/org/apache/cloudstack/utils/template/TemplateUtils.java
@@ -34,7 +34,7 @@ public class TemplateUtils {
         if (isCompressedExtension(url)) {
             command = "file -z ";
         }
-        String output = Script.runSimpleBashScript(command + path + " | cut -d: -f2", 1000);
+        String output = Script.runSimpleBashScript(command + path + " | cut -d: -f2", 60000);
 
         // vmdk
         if ((output.contains("VMware") || output.contains("data")) && isCorrectExtension(url,
"vmdk")) {


Mime
View raw message