etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
cloudstack/test/integration
History
SrikanteswaraRao Talluri d22adf943d Merge branch 'marvin' 
Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>

Conflicts:
	test/integration/component/test_dynamic_compute_offering.py
	test/integration/smoke/test_deploy_vm.py
	test/integration/smoke/test_disk_offerings.py
	test/integration/smoke/test_volumes.py
 		2014-04-23 11:45:43 +05:30
..
component Merge branch 'marvin' 2014-04-23 11:45:43 +05:30
smoke Merge branch 'marvin' 2014-04-23 11:45:43 +05:30
__init__.py apply chip childers licensing patches for the test directory 2012-06-26 11:19:58 -04:00