git commit: updated refs/heads/master to c141e41

[gi...@apache.org]

Updated Branches:
  refs/heads/master 4f302c124 -> c141e418e


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

Branch: refs/heads/master
Commit: c141e418e927dadc90a87ad4e1a939091cfbe54e
Parents: 4f302c1
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:23:18 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/c141e418/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)