cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject [39/50] [abbrv] git commit: updated refs/heads/hotfix/scp-exception to e13d45e
Date Sat, 21 Feb 2015 11:34:15 GMT
CLOUDSTACK-8264: Adding missing change in test_data.py caused due to commit 500baea9b6c816caae93ab2f8d0ba31f99c3f8fc

Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>


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

Branch: refs/heads/hotfix/scp-exception
Commit: 7629000ffe96afdbe83d268e9be38b7fdb2ba300
Parents: 43a39d1
Author: Gaurav Aradhye <gaurav.aradhye@clogeny.com>
Authored: Wed Feb 18 03:15:33 2015 -0800
Committer: SrikanteswaraRao Talluri <talluri@apache.org>
Committed: Thu Feb 19 15:23:25 2015 +0530

----------------------------------------------------------------------
 tools/marvin/marvin/config/test_data.py | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7629000f/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 f8cadf5..e8365ed 100644
--- a/tools/marvin/marvin/config/test_data.py
+++ b/tools/marvin/marvin/config/test_data.py
@@ -877,13 +877,6 @@ test_data = {
         "customdisksize": 1,
         "diskname": "Custom disk",
     },
-    "upload_volume": {
-        "diskname": "UploadVol",
-        "format": "VHD",
-        "url":
-        "http://10.147.28.7/templates/393d3550-05ef-330f-9b8c-745b0e699759.vhd",
-        "checksum": "",
-    },
     "recurring_snapshot": {
         "maxsnaps": 2,
         "timezone": "US/Arizona",
@@ -1475,5 +1468,11 @@ test_data = {
             "url": '',
             "clustername": 'VMWare Cluster with Space in DC name',
         },
+        "upload_volume": {
+            "diskname": "UploadVol",
+            "format": "VHD",
+            "url": "",
+            "checksum": "",
+        },
     }
 }


Mime
View raw message