etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
cloudstack/test/integration/component
History
Alena Prokharchyk 1b8a6986a6 Merge branch 'master' into internallb1 
Conflicts:
	api/src/com/cloud/async/AsyncJob.java
	api/src/com/cloud/network/NetworkModel.java
	api/src/com/cloud/network/rules/LoadBalancerContainer.java
	api/src/org/apache/cloudstack/api/BaseCmd.java
	api/src/org/apache/cloudstack/api/ResponseGenerator.java
	api/src/org/apache/cloudstack/network/lb/ApplicationLoadBalancerContainer.java
	client/tomcatconf/commands.properties.in
	engine/schema/src/com/cloud/network/dao/LoadBalancerDaoImpl.java
	server/src/com/cloud/api/ApiResponseHelper.java
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/NetworkModelImpl.java
	server/src/com/cloud/network/NetworkServiceImpl.java
	server/src/com/cloud/server/ManagementServerImpl.java
	server/test/com/cloud/network/MockNetworkModelImpl.java
	server/test/com/cloud/vpc/MockNetworkManagerImpl.java
	server/test/com/cloud/vpc/MockNetworkModelImpl.java
	server/test/resources/appLoadBalancer.xml
	setup/db/db/schema-410to420.sql
	test/integration/component/test_multiple_ip_ranges.py
	test/integration/smoke/test_guest_vlan_range.py
	tools/marvin/marvin/integration/lib/base.py
 		2013-05-08 13:29:43 -07:00
..
__init__.py apply chip childers licensing patches for the test directory 2012-06-26 11:19:58 -04:00
test_accounts.py CLOUDSTACK-2377: change memory size to 128 mb for the tiny service offering in the integration tests 2013-05-08 14:26:44 +05:30
test_allocation_states.py CLOUDSTACK-2377: change memory size to 128 mb for the tiny service offering in the integration tests 2013-05-08 14:26:44 +05:30
test_asa1000v_fw.py naming conventions for test_modules 2013-04-21 14:26:27 +05:30
test_blocker_bugs.py CLOUDSTACK-2377: change memory size to 128 mb for the tiny service offering in the integration tests 2013-05-08 14:26:44 +05:30
test_egress_rules.py CLOUDSTACK-2377: change memory size to 128 mb for the tiny service offering in the integration tests 2013-05-08 14:26:44 +05:30
test_eip_elb.py CLOUDSTACK-2377: change memory size to 128 mb for the tiny service offering in the integration tests 2013-05-08 14:26:44 +05:30
test_multiple_ip_ranges.py Merge branch 'master' into internallb1 2013-05-08 13:29:43 -07:00
test_network_offering.py CLOUDSTACK-2377: change memory size to 128 mb for the tiny service offering in the integration tests 2013-05-08 14:26:44 +05:30
test_project_configs.py CLOUDSTACK-2377: change memory size to 128 mb for the tiny service offering in the integration tests 2013-05-08 14:26:44 +05:30
test_project_limits.py CLOUDSTACK-2377: change memory size to 128 mb for the tiny service offering in the integration tests 2013-05-08 14:26:44 +05:30
test_project_resources.py CLOUDSTACK-2377: change memory size to 128 mb for the tiny service offering in the integration tests 2013-05-08 14:26:44 +05:30
test_project_usage.py CLOUDSTACK-2377: change memory size to 128 mb for the tiny service offering in the integration tests 2013-05-08 14:26:44 +05:30
test_projects.py CLOUDSTACK-2377: change memory size to 128 mb for the tiny service offering in the integration tests 2013-05-08 14:26:44 +05:30
test_regions.py Breaking down region tests 2013-05-08 13:50:04 +05:30
test_regions_accounts.py Breaking down region tests 2013-05-08 13:50:04 +05:30
test_resource_limits.py CLOUDSTACK-2377: change memory size to 128 mb for the tiny service offering in the integration tests 2013-05-08 14:26:44 +05:30
test_routers.py CLOUDSTACK-2377: change memory size to 128 mb for the tiny service offering in the integration tests 2013-05-08 14:26:44 +05:30
test_security_groups.py CLOUDSTACK-2377: change memory size to 128 mb for the tiny service offering in the integration tests 2013-05-08 14:26:44 +05:30
test_snapshots.py CLOUDSTACK-2323: fix test scripts to conform with library changes 2013-05-07 13:13:55 -07:00
test_storage_motion.py CLOUDSTACK-2361: fix storage xenmotion test script 2013-05-08 14:26:43 +05:30
test_templates.py CLOUDSTACK-2377: change memory size to 128 mb for the tiny service offering in the integration tests 2013-05-08 14:26:44 +05:30
test_usage.py CLOUDSTACK-2377: change memory size to 128 mb for the tiny service offering in the integration tests 2013-05-08 14:26:44 +05:30
test_vm_passwdenabled.py CLOUDSTACK-2323: fix test scripts to conform with library changes 2013-05-07 13:13:55 -07:00
test_volumes.py CLOUDSTACK-2377: change memory size to 128 mb for the tiny service offering in the integration tests 2013-05-08 14:26:44 +05:30
test_vpn_users.py CLOUDSTACK-2323: fix test scripts to conform with library changes 2013-05-07 13:13:55 -07:00