You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by gi...@apache.org on 2013/11/15 11:51:22 UTC

git commit: updated refs/heads/4.2 to a95bea0

Updated Branches:
  refs/heads/4.2 7671d0fc3 -> a95bea08e


CLOUDSTACK-5180: Increasing the timeout for uploading volume


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

Branch: refs/heads/4.2
Commit: a95bea08e4c41e359c137068245d04bae4d1dff4
Parents: 7671d0f
Author: Gaurav Aradhye <ga...@clogeny.com>
Authored: Fri Nov 15 16:20:46 2013 +0530
Committer: Girish Shilamkar <gi...@clogeny.com>
Committed: Fri Nov 15 16:20:46 2013 +0530

----------------------------------------------------------------------
 tools/marvin/marvin/integration/lib/base.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a95bea08/tools/marvin/marvin/integration/lib/base.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base.py b/tools/marvin/marvin/integration/lib/base.py
index a3a5f58..b03c552 100755
--- a/tools/marvin/marvin/integration/lib/base.py
+++ b/tools/marvin/marvin/integration/lib/base.py
@@ -742,7 +742,7 @@ class Volume:
             cmd.url = services["url"]
         return Volume(apiclient.uploadVolume(cmd).__dict__)
 
-    def wait_for_upload(self, apiclient, timeout=5, interval=60):
+    def wait_for_upload(self, apiclient, timeout=10, interval=60):
         """Wait for upload"""
         # Sleep to ensure template is in proper state before download
         time.sleep(interval)