cloudstack/tools/marvin
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
..
marvin Merge branch 'marvin' 2014-04-23 11:45:43 +05:30
CHANGES.txt Missing LICENSE headers for sandbox and __init__.py's 2012-08-04 17:29:47 +05:30
DISCLAIMER.txt Adding DISCLAIMER.txt to the marvin tool. 2012-10-17 12:27:00 -04:00
LICENSE.txt CLOUDSTACK-326: Corrected marvin license file to be full ASLv2 license text 2012-10-12 16:41:17 -04:00
MANIFEST.in Missing LICENSE headers for sandbox and __init__.py's 2012-08-04 17:29:47 +05:30
pom.xml Update master to 4.5.0-SNAPSHOT 2014-03-14 14:55:26 +01:00
setup.py Added few changes for CLOUDSTACK-6316 2014-04-16 15:56:30 +05:30