cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tall...@apache.org
Subject git commit: updated refs/heads/master to 6338db1
Date Thu, 20 Mar 2014 13:38:08 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/master d38cab879 -> 6338db1f9


CLOUDSTACK-5113: temporary fix to return first template in the list


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

Branch: refs/heads/master
Commit: 6338db1f9a976e7cd36cece17ee8e2402fa89501
Parents: d38cab8
Author: SrikanteswaraRao Talluri <talluri@apache.org>
Authored: Thu Mar 20 19:07:44 2014 +0530
Committer: SrikanteswaraRao Talluri <talluri@apache.org>
Committed: Thu Mar 20 19:07:44 2014 +0530

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


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6338db1f/tools/marvin/marvin/integration/lib/common.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/common.py b/tools/marvin/marvin/integration/lib/common.py
index 3b292bf..585a05a 100644
--- a/tools/marvin/marvin/integration/lib/common.py
+++ b/tools/marvin/marvin/integration/lib/common.py
@@ -234,7 +234,7 @@ def get_template(apiclient, zoneid, ostype, services=None,
         for template in list_templates:
             if template.isready and template.templatetype == templatetype:
                 return template
-
+        return list_templates[0]
     raise Exception("Exception: Failed to find built in template which is in "
                                 "ready state: %s" % templatetype)
     return


Mime
View raw message