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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								SrikanteswaraRao Talluri
							
						 
					 | 
					
						
						
						
						
							
						
						
							91a5e3bb66
							
						
					 | 
					
						
						
							
							CLOUDSTACK-6125: adding 'selfservice','provisioning' tags to segregate the tests
						
						
						
						
						
						
						
						that can be run on simulator only and that needs hardware. 
						
						
					 | 
					
						2014-03-28 15:34:57 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Girish Shilamkar
							
						 
					 | 
					
						
						
						
						
							
						
						
							d70ef2a279
							
						
					 | 
					
						
						
							
							CLOUDSTACK-5925: Changes to regression tests as per new get_zone, get_pod etc definitions
						
						
						
						
						
						
					 | 
					
						2014-02-26 17:13:21 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Santhosh Edukulla
							
						 
					 | 
					
						
						
						
						
							
						
						
							bf72441d13
							
						
					 | 
					
						
						
							
							CLOUDSTACK-6006: Remove integration folder and lib
						
						
						
						
						
						
					 | 
					
						2014-02-04 12:01:58 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Gaurav Aradhye
							
						 
					 | 
					
						
						
						
						
							
						
						
							5882123f19
							
						
					 | 
					
						
						
							
							CLOUDSTACK-5640: Correcting imports in test cases
						
						
						
						
						
						
						
						Conflicts:
	test/integration/component/test_security_groups.py 
						
						
					 | 
					
						2013-12-30 14:40:58 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Gaurav Aradhye
							
						 
					 | 
					
						
						
						
						
							
						
						
							1972d6121d
							
						
					 | 
					
						
						
							
							Adding missing test cases: Snapshots Improvement
						
						
						
						
						
						
					 | 
					
						2013-10-29 23:42:38 +05:30 | 
					
					
						
						
							
							
							
						
					 |