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

..

com/cloud/network

check for BroadcastDomainTypes on sourceNatIp

2014-01-06 22:13:51 +01:00

integration/api

CLOUDSTACK-6006: Remove integration folder and lib

2014-02-04 12:01:58 +05:30

org/apache/cloudstack

Merge branch 'master' into rbac.

2014-03-13 11:05:03 -07:00