anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							c2dd960405 
							
						 
					 
					
						
						
							
							VLAN patch for XenServer 5.6  
						
						
						
						
					 
					
						2011-08-15 13:55:06 -07:00 
						 
				 
			
				
					
						
							
							
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							4b3f57fd28 
							
						 
					 
					
						
						
							
							VLAN patch for XenServer 5.6  
						
						
						
						
					 
					
						2011-08-15 13:54:43 -07:00 
						 
				 
			
				
					
						
							
							
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							e5e85d05e9 
							
						 
					 
					
						
						
							
							bug 10695: add XCP 1.0 support  
						
						... 
						
						
						
						status 10695: resolved fixed
Conflicts:
	core/src/com/cloud/hypervisor/xen/resource/CitrixHelper.java 
						
						
					 
					
						2011-08-09 19:51:32 -07:00 
						 
				 
			
				
					
						
							
							
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							33b3e02c17 
							
						 
					 
					
						
						
							
							bug 10695: add XCP 1.0 support  
						
						... 
						
						
						
						status 10695: resolved fixed 
						
						
					 
					
						2011-08-09 19:49:12 -07:00 
						 
				 
			
				
					
						
							
							
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							94861ecf4a 
							
						 
					 
					
						
						
							
							For some NFS Servers, mount option tcp is required  
						
						
						
						
					 
					
						2011-08-08 17:58:47 -07:00 
						 
				 
			
				
					
						
							
							
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							ef2802aaed 
							
						 
					 
					
						
						
							
							For some NFS Servers, mount option tcp is required  
						
						
						
						
					 
					
						2011-08-08 15:31:18 -07:00 
						 
				 
			
				
					
						
							
							
								Chiradeep Vittal 
							
						 
					 
					
						
						
						
						
							
						
						
							8277584b8a 
							
						 
					 
					
						
						
							
							merge ELB / nectarine branch  
						
						
						
						
					 
					
						2011-08-08 15:20:56 -07:00 
						 
				 
			
				
					
						
							
							
								Chiradeep Vittal 
							
						 
					 
					
						
						
						
						
							
						
						
							736b6cf98e 
							
						 
					 
					
						
						
							
							properly clean up rules for nonexistent vms  
						
						
						
						
					 
					
						2011-08-04 22:58:42 -07:00 
						 
				 
			
				
					
						
							
							
								Chiradeep Vittal 
							
						 
					 
					
						
						
						
						
							
						
						
							0c408d8da5 
							
						 
					 
					
						
						
							
							handle elb vm restart  
						
						
						
						
					 
					
						2011-08-04 22:05:48 -07:00 
						 
				 
			
				
					
						
							
							
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							8d47c53735 
							
						 
					 
					
						
						
							
							Revert "bug 10435: removed vpn feature"  
						
						... 
						
						
						
						This reverts commit ea9e1b5d138950e8de49fce7ffdbb12a1c72c560.
Conflicts:
	api/src/com/cloud/api/ResponseGenerator.java
	scripts/vm/hypervisor/xenserver/vmops
	server/src/com/cloud/configuration/Config.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManager.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java 
						
						
					 
					
						2011-08-02 18:12:57 -07:00 
						 
				 
			
				
					
						
							
							
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							7c420a071c 
							
						 
					 
					
						
						
							
							use rmdir  
						
						
						
						
					 
					
						2011-08-01 11:55:05 -07:00 
						 
				 
			
				
					
						
							
							
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							767d4b104a 
							
						 
					 
					
						
						
							
							use rmdir  
						
						
						
						
					 
					
						2011-08-01 11:48:56 -07:00 
						 
				 
			
				
					
						
							
							
								Chiradeep Vittal 
							
						 
					 
					
						
						
						
						
							
						
						
							29c88787e1 
							
						 
					 
					
						
						
							
							from eip feature:  
						
						... 
						
						
						
						1. fix ordering of ingress and egress rules so that vms are protected from other vms on the same host in all cases
2. remove dependency on cloud-guest 
						
						
					 
					
						2011-07-28 16:08:51 -07:00 
						 
				 
			
				
					
						
							
							
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							6620d39b7e 
							
						 
					 
					
						
						
							
							fixed cloud-prepare-upgrade.sh  
						
						
						
						
					 
					
						2011-07-28 15:07:26 -07:00 
						 
				 
			
				
					
						
							
							
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							b63bee2d9a 
							
						 
					 
					
						
						
							
							bug 10197: add some scripts which is used in upgrade  
						
						
						
						
					 
					
						2011-07-28 15:07:08 -07:00 
						 
				 
			
				
					
						
							
							
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							fc94196920 
							
						 
					 
					
						
						
							
							fixed cloud-prepare-upgrade.sh  
						
						
						
						
					 
					
						2011-07-28 15:03:39 -07:00 
						 
				 
			
				
					
						
							
							
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							5b168f30e0 
							
						 
					 
					
						
						
							
							bug 10197: add some scripts which is used in upgrade  
						
						
						
						
					 
					
						2011-07-26 16:22:54 -07:00 
						 
				 
			
				
					
						
							
							
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							bad0f77659 
							
						 
					 
					
						
						
							
							use the safe way to delete secondary storage directory  
						
						
						
						
					 
					
						2011-07-25 18:16:05 -07:00 
						 
				 
			
				
					
						
							
							
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							a7af9cdae2 
							
						 
					 
					
						
						
							
							use the safe way to delete secondary storage directory  
						
						
						
						
					 
					
						2011-07-22 19:35:46 -07:00 
						 
				 
			
				
					
						
							
							
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							afbadbf223 
							
						 
					 
					
						
						
							
							use the safe way to delete secondary storage directory  
						
						
						
						
					 
					
						2011-07-22 19:29:58 -07:00 
						 
				 
			
				
					
						
							
							
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							e666cf5e77 
							
						 
					 
					
						
						
							
							bug 10743: default local storage is ext in XenServer 6.0, add ext local storage support  
						
						
						
						
					 
					
						2011-07-21 17:31:43 -07:00 
						 
				 
			
				
					
						
							
							
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							c152d1c33f 
							
						 
					 
					
						
						
							
							support XenServer 6.0 beta  
						
						
						
						
					 
					
						2011-07-20 16:47:48 -07:00 
						 
				 
			
				
					
						
							
							
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							9f2eaca6cb 
							
						 
					 
					
						
						
							
							Support XenServer 6.0 beta  
						
						
						
						
					 
					
						2011-07-20 16:47:48 -07:00 
						 
				 
			
				
					
						
							
							
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							7a47a5afcf 
							
						 
					 
					
						
						
							
							introduce nfs.py and NFSSR.py from XenServer 6.0 beta  
						
						
						
						
					 
					
						2011-07-20 16:47:48 -07:00 
						 
				 
			
				
					
						
							
							
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							44d4113ae6 
							
						 
					 
					
						
						
							
							bug 10429: backport redundant router  
						
						... 
						
						
						
						Part 2
commit 797839360c65cd348d2eb20630521177ab0919de
    bug 9154: redundant virtual router
commit 8ff7f230204d4d3a7a4adee75523a9a84f4276fe
    bug 9154: Replace domain_router.is_master with domain_router.redundant_state in DB
commit 230b99e9e0b152648f1dd2a5eab6f22315b8e7b4
    bug 9154: Add redundant state to DomainRouterResponse
commit ccefb5ff5e83d713798a347c99bce1a0d04b4317
    bug 9154: Add router fault state report
commit 7a3090378f9785caecf741b70554f6ea17c41764
    bug 9154: Send alert if found two virtual routers in master state
commit 66831056e4bf27665871bccd24e6159071564847
    bug 9154: Code clean up
commit bf3f58a85741fa7118bd848a42d8b21baa4478d4
    bug 9154: Add isRedundantRouter to DomainRouterResponse 
						
						
					 
					
						2011-07-18 18:30:02 -07:00 
						 
				 
			
				
					
						
							
							
								Chiradeep Vittal 
							
						 
					 
					
						
						
						
						
							
						
						
							7d95efb7c6 
							
						 
					 
					
						
						
							
							fix ipset problem introduced by 58e92bbe84c2a61ef72913dcb4a88cd761c89604  
						
						
						
						
					 
					
						2011-07-10 12:44:15 -07:00 
						 
				 
			
				
					
						
							
							
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							81475c256b 
							
						 
					 
					
						
						
							
							fix user/meta data: if data is empty, return a blank file, not 404  
						
						
						
						
					 
					
						2011-07-08 13:50:27 -07:00 
						 
				 
			
				
					
						
							
							
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							56bc4f27a9 
							
						 
					 
					
						
						
							
							fix user/meta data: if data is empty, return a blank file, not 404  
						
						
						
						
					 
					
						2011-07-01 12:58:14 -07:00 
						 
				 
			
				
					
						
							
							
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							74f34a0e0c 
							
						 
					 
					
						
						
							
							bug 10435: removed vpn feature  
						
						... 
						
						
						
						status 10435: resolved fixed 
						
						
					 
					
						2011-06-24 09:18:46 -07:00 
						 
				 
			
				
					
						
							
							
								David Nalley 
							
						 
					 
					
						
						
						
						
							
						
						
							6bb0b490ca 
							
						 
					 
					
						
						
							
							fixing some typos in error messages  
						
						
						
						
					 
					
						2011-06-20 15:22:33 -04:00 
						 
				 
			
				
					
						
							
							
								David Nalley 
							
						 
					 
					
						
						
						
						
							
						
						
							fb0dae2ce5 
							
						 
					 
					
						
						
							
							fixing some typos in error messages  
						
						
						
						
					 
					
						2011-06-20 15:18:30 -04:00 
						 
				 
			
				
					
						
							
							
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							a492c07e4c 
							
						 
					 
					
						
						
							
							bug 9154: redundant virtual router  
						
						... 
						
						
						
						Add CheckRouterCommand for XenServer
Now VMware/Xen/KVM all support redundant virtual router. 
						
						
					 
					
						2011-06-14 15:45:29 -07:00 
						 
				 
			
				
					
						
							
							
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							5e1bdce052 
							
						 
					 
					
						
						
							
							bug 10081: don't save iptable  
						
						
						
						
					 
					
						2011-06-06 18:19:01 -07:00 
						 
				 
			
				
					
						
							
							
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							072fd1b1c5 
							
						 
					 
					
						
						
							
							bug 10111: set hidden flag to 0 after copy template from secondary storage to primary storage  
						
						... 
						
						
						
						status 10111: resolved fixed 
						
						
					 
					
						2011-06-01 17:44:09 -07:00 
						 
				 
			
				
					
						
							
							
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							2dbb8eb502 
							
						 
					 
					
						
						
							
							bug 9651: Make same VLAN work on two different nics  
						
						
						
						
					 
					
						2011-06-01 17:07:44 -07:00 
						 
				 
			
				
					
						
							
							
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							c2afcdec52 
							
						 
					 
					
						
						
							
							bug 9873: always add default security group to the SG list when deploy vm in 1) Basic zone 2) Advance zone using SG enabled network  
						
						... 
						
						
						
						status 9873: resolved fixed
Following fixes were made as a part of the checkin:
* When deploy user vm and SG doesn't exist in the DB, create it automatically.
* SecurityGroup enabled use vm start: if map to default group is not present in security_group_vm_map table, create one.
* Added "name" (securityGroupName) parameter back to deleteSecurityGroup/authorizeSecurityGroupIngress/deployVm. Mutually exclusive with security group id parameter.
Conflicts:
	api/src/com/cloud/api/commands/AuthorizeSecurityGroupIngressCmd.java
	api/src/com/cloud/api/commands/DeleteSecurityGroupCmd.java
	api/src/com/cloud/api/commands/DeployVMCmd.java
	server/src/com/cloud/api/ApiDBUtils.java
	server/src/com/cloud/vm/UserVmManagerImpl.java 
						
						
					 
					
						2011-05-17 15:08:13 -07:00 
						 
				 
			
				
					
						
							
							
								Frank 
							
						 
					 
					
						
						
						
						
							
						
						
							aad64a5170 
							
						 
					 
					
						
						
							
							Fix in XenServer, when do primarystorage downlaod command, mount secondary storage  
						
						... 
						
						
						
						as readonly. And umount with options -fl to avoid hang if at that time NFS server down 
						
						
					 
					
						2011-05-16 13:50:45 -07:00 
						 
				 
			
				
					
						
							
							
								Chiradeep Vittal 
							
						 
					 
					
						
						
						
						
							
						
						
							46e40cab3f 
							
						 
					 
					
						
						
							
							ebtables not programmed in some cases  
						
						
						
						
					 
					
						2011-05-13 14:41:37 -07:00 
						 
				 
			
				
					
						
							
							
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							bf54422b11 
							
						 
					 
					
						
						
							
							bug 9866:  
						
						... 
						
						
						
						It happens only when the template is not created by XenServer and the virtual disk size is not integer time of 2M.
    fixed in 2.2.4
    status 9866: resolved fixed 
						
						
					 
					
						2011-05-12 18:28:56 -07:00 
						 
				 
			
				
					
						
							
							
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							10c4c14ad5 
							
						 
					 
					
						
						
							
							swift integration checkin  
						
						
						
						
					 
					
						2011-05-05 13:55:29 -07:00 
						 
				 
			
				
					
						
							
							
								Chiradeep Vittal 
							
						 
					 
					
						
						
						
						
							
						
						
							4ab68bd44a 
							
						 
					 
					
						
						
							
							bug 9689: handle old style vm names  
						
						
						
						
					 
					
						2011-05-04 14:21:49 -07:00 
						 
				 
			
				
					
						
							
							
								Chiradeep Vittal 
							
						 
					 
					
						
						
						
						
							
						
						
							aecd64e51c 
							
						 
					 
					
						
						
							
							bug 9092: consistent naming  
						
						
						
						
					 
					
						2011-05-04 14:21:49 -07:00 
						 
				 
			
				
					
						
							
							
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							d2e68c2dab 
							
						 
					 
					
						
						
							
							bug 9525: empty known_hosts at reconnect  
						
						... 
						
						
						
						status 9525: resolved fixed 
						
						
					 
					
						2011-04-29 14:13:25 -07:00 
						 
				 
			
				
					
						
							
							
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							8271f034ce 
							
						 
					 
					
						
						
							
							bug 9541: fix one snapshot DB migrate, one java check and one script typo  
						
						... 
						
						
						
						status 9541: resolved fixed 
						
						
					 
					
						2011-04-22 12:57:16 -07:00 
						 
				 
			
				
					
						
							
							
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							054f6b0199 
							
						 
					 
					
						
						
							
							bug 9472: when get vnc port for a vm,  check if the port is really used by this vm for security  
						
						... 
						
						
						
						status 9472: resolved fixed 
						
						
					 
					
						2011-04-15 12:47:12 -07:00 
						 
				 
			
				
					
						
							
							
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							44678b60bc 
							
						 
					 
					
						
						
							
							add VERSION into to scripts  
						
						
						
						
					 
					
						2011-03-23 14:54:31 -07:00 
						 
				 
			
				
					
						
							
							
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							bdcffa2b0d 
							
						 
					 
					
						
						
							
							bug 8061: add forcely shutdown  
						
						
						
						
					 
					
						2011-03-09 16:30:11 -08:00 
						 
				 
			
				
					
						
							
							
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							5b1a421e62 
							
						 
					 
					
						
						
							
							bug 8712: prepare from snapshot db migration  
						
						
						
						
					 
					
						2011-03-08 17:10:27 -08:00 
						 
				 
			
				
					
						
							
							
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							0c2a639a2d 
							
						 
					 
					
						
						
							
							bug 6772: use vhd-util to coalesce snapshots into primary storage  
						
						... 
						
						
						
						status 6772: resolved fixed 
						
						
					 
					
						2011-03-07 19:47:29 -08:00 
						 
				 
			
				
					
						
							
							
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							b8e03aca4c 
							
						 
					 
					
						
						
							
							script fix  
						
						
						
						
					 
					
						2011-03-07 19:47:29 -08:00