cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject [03/24] git commit: updated refs/heads/4.4 to e33d4a5
Date Mon, 28 Jul 2014 15:44:30 GMT
removed basic zone tag and added advanced zone tag

Conflicts:
	test/integration/smoke/test_nic.py

(cherry picked from commit 486ee69ef47fe675921ee255eea112675e20418c)


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

Branch: refs/heads/4.4
Commit: 7a2f3f21a51785b7208627e438f3ba4a5a62e522
Parents: a606277
Author: SrikanteswaraRao Talluri <talluri@apache.org>
Authored: Wed Apr 30 14:00:18 2014 +0530
Committer: Daan Hoogland <daan@onecht.net>
Committed: Mon Jul 28 17:43:14 2014 +0200

----------------------------------------------------------------------
 test/integration/smoke/test_nic.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7a2f3f21/test/integration/smoke/test_nic.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_nic.py b/test/integration/smoke/test_nic.py
index 3f91d70..592a839 100644
--- a/test/integration/smoke/test_nic.py
+++ b/test/integration/smoke/test_nic.py
@@ -119,7 +119,7 @@ class TestNic(cloudstackTestCase):
         except Exception as ex:
             self.debug("Exception during NIC test SETUP!: " + str(ex))
 
-    @attr(tags = ["devcloud",  "smoke", "advanced", "provisioning"])
+    @attr(tags = ["devcloud",  "smoke", "advanced", "advancedns", "provisioning"])
     def test_01_nic(self):
         #TODO: SIMENH: add validation
         """Test to add and update added nic to a virtual machine"""


Mime
View raw message