Commit Graph

4 Commits

Author SHA1 Message Date
Santhosh Edukulla 45db2348de CLOUDSTACK-6914: Fixed the Issue
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
(cherry picked from commit 54e4c07528)
2014-07-28 23:12:47 +02:00
SrikanteswaraRao Talluri 798a6aa2e3 Marvin + test changes from master Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
(cherry picked from commit 404ac549bf)

Conflicts:
	test/integration/smoke/test_vm_iam.py
	tools/marvin/marvin/deployDataCenter.py
	tools/marvin/marvin/lib/base.py
2014-07-28 17:40:56 +02:00
SrikanteswaraRao Talluri 14796783fd CLOUDSTACK-6125: added smoke tests with following tags 1. selfservice - tests which can be run on simulator. 2. provisioning - tests that need actual hypervisor resource.
Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
2014-03-28 15:39:22 +05:30
Nitin Mehta c11dbad9c9 merge master 2013-05-11 15:28:43 +05:30