cloudstack

mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00

History

SrikanteswaraRao Talluri 0e223d6787 Merge branch 'master' into marvin

Conflicts:
	test/integration/component/test_base_image_updation.py
	test/integration/component/test_cpu_domain_limits.py
	test/integration/component/test_cpu_limits.py
	test/integration/component/test_cpu_project_limits.py
	test/integration/component/test_ip_reservation.py
	test/integration/component/test_memory_limits.py
	test/integration/component/test_mm_domain_limits.py
	test/integration/component/test_mm_project_limits.py
	test/integration/component/test_persistent_networks.py
	test/integration/component/test_portable_ip.py
	test/integration/component/test_routers.py
	test/integration/smoke/test_deploy_vm.py
	test/integration/smoke/test_deploy_vm_with_userdata.py
	test/integration/smoke/test_internal_lb.py
	test/integration/smoke/test_vm_life_cycle.py
	test/integration/smoke/test_volumes.py
	tools/marvin/marvin/codes.py
	tools/marvin/marvin/configGenerator.py
	tools/marvin/marvin/lib/base.py
	tools/marvin/marvin/lib/common.py
	tools/marvin/marvin/lib/utils.py

2014-04-08 17:53:37 +05:30

bindirbak

apply chip childers licensing patches for the test directory

2012-06-26 11:19:58 -04:00

conf

Uniting all the READMEs from tools and test

2012-10-12 17:01:20 +05:30

integration

Merge branch 'master' into marvin

2014-04-08 17:53:37 +05:30

metadata

License header updates for the test folder.