You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by sa...@apache.org on 2015/03/30 12:57:55 UTC
git commit: updated refs/heads/volume-upload to eac8d4b
Repository: cloudstack
Updated Branches:
refs/heads/volume-upload 5e7baa5a5 -> eac8d4b15
Updated test data file with osid
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/eac8d4b1
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/eac8d4b1
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/eac8d4b1
Branch: refs/heads/volume-upload
Commit: eac8d4b15336d843147bcfe30acf44c141776985
Parents: 5e7baa5
Author: sailajamada <sa...@citrix.com>
Authored: Mon Mar 30 16:21:41 2015 +0530
Committer: sailajamada <sa...@citrix.com>
Committed: Mon Mar 30 16:21:41 2015 +0530
----------------------------------------------------------------------
tools/marvin/marvin/config/test_data.py | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/eac8d4b1/tools/marvin/marvin/config/test_data.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/config/test_data.py b/tools/marvin/marvin/config/test_data.py
index 9c12a0f..48053eb 100644
--- a/tools/marvin/marvin/config/test_data.py
+++ b/tools/marvin/marvin/config/test_data.py
@@ -1537,7 +1537,7 @@ test_data = {
"url": "http://10.147.28.7/templates/builtin/centos56-x86_64.vhd.bz2",
"hypervisor":"XenServer",
"checksum": "09b08b6abb1b903fca7711d3ac8d6598",
- "ostypeid":"fbe5230a-d490-11e4-a923-2611fa84f51d"
+ "ostypeid":"142"
},
"OVA": {
"templatename": "VMwareUploadtemplate",
@@ -1545,7 +1545,7 @@ test_data = {
"url": "http://nfs1.lab.vmops.com/templates/vmware/CentOS5.3-x86_64.ova",
"checksum": "02de0576dd3a61ab59c03fd795fc86ac",
"hypervisor":"VMware",
- "ostypeid":"74affaea-c658-11e4-ad38-a6d1374244b4"
+ "ostypeid":"142"
},
"QCOW2": {
"templatename": "KVMUploadtemplate",
@@ -1553,7 +1553,7 @@ test_data = {
"url": "http://10.147.28.7/templates/builtin/eec2209b-9875-3c8d-92be-c001bd8a0faf.qcow2.bz2",
"checksum": "d06b5f6a-d44e-11e4-9d99-4af3a393b3ac",
"hypervisor":"KVM",
- "ostypeid":"d084e2c8-d44e-11e4-9d99-4af3a393b3ac"
+ "ostypeid":"142"
},
},
"bootableIso":