Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							a46c2cb650 
							
						 
					 
					
						
						
							
							Send CheckRouter command only when router is running  
						
						 
						
						
						
						
					 
					
						2011-08-03 16:57:43 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							f34bf1c5e7 
							
						 
					 
					
						
						
							
							delete the default iptable rule  
						
						 
						
						
						
						
					 
					
						2011-08-03 13:39:21 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							cb5e4574f9 
							
						 
					 
					
						
						
							
							bug 10946: Add default buffer length for compressed request  
						
						 
						
						... 
						
						
						
						Then it can support 2.2.8 system vm connection.
status 10946: resolved fixed 
						
						
					 
					
						2011-08-03 11:54:11 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							a7bc955822 
							
						 
					 
					
						
						
							
							Added missing config value to 229 to 2210 upgrade  
						
						 
						
						
						
						
					 
					
						2011-08-03 10:35:06 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							da4b39279d 
							
						 
					 
					
						
						
							
							Added 229 to 2210 upgrade path  
						
						 
						
						... 
						
						
						
						Conflicts:
	server/src/com/cloud/upgrade/DatabaseUpgradeChecker.java
	setup/db/db/schema-228to229.sql 
						
						
					 
					
						2011-08-03 10:23:27 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							cf7e351cbf 
							
						 
					 
					
						
						
							
							bug 10921: remove obsolete keys during 2.1.x to 2.2.9 upgrade  
						
						 
						
						... 
						
						
						
						status 10921: resolved fixed
Conflicts:
	server/src/com/cloud/upgrade/dao/Upgrade228to229.java 
						
						
					 
					
						2011-08-03 10:15:09 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Naredula Janardhana Reddy 
							
						 
					 
					
						
						
						
						
							
						
						
							46427fef91 
							
						 
					 
					
						
						
							
							bug 10561: Allowing ICMP traffic through static NAT  
						
						 
						
						
						
						
					 
					
						2011-08-03 21:15:02 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Abhinandan Prateek 
							
						 
					 
					
						
						
						
						
							
						
						
							b74c398d76 
							
						 
					 
					
						
						
							
							domain syntax check for zoneupdate  
						
						 
						
						
						
						
					 
					
						2011-08-03 14:41:04 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Abhinandan Prateek 
							
						 
					 
					
						
						
						
						
							
						
						
							cd78c5cb9b 
							
						 
					 
					
						
						
							
							bug 10812: putting key in ZoneConfig and other nomenclature changes  
						
						 
						
						
						
						
					 
					
						2011-08-03 14:32:28 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Abhinandan Prateek 
							
						 
					 
					
						
						
						
						
							
						
						
							6dd519ddd4 
							
						 
					 
					
						
						
							
							bug 10812: putting key in ZoneConfig and other nomenclature changes  
						
						 
						
						
						
						
					 
					
						2011-08-03 14:16:08 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Abhinandan Prateek 
							
						 
					 
					
						
						
						
						
							
						
						
							7e727be42c 
							
						 
					 
					
						
						
							
							bug 10748: use external dnses if set thru global config (dhcp otpion 6)  
						
						 
						
						
						
						
					 
					
						2011-08-03 12:34:02 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Chiradeep Vittal 
							
						 
					 
					
						
						
						
						
							
						
						
							8ccfdc08de 
							
						 
					 
					
						
						
							
							handle release of ip on deletion of loadbalancer rule  
						
						 
						
						
						
						
					 
					
						2011-08-02 20:31:37 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							8a5a057231 
							
						 
					 
					
						
						
							
							bug 10483: if hypervisor doesn't support a guest OS type, boot from ISO of this guest OS type fails,  
						
						 
						
						... 
						
						
						
						deployed VM is not impacted, if the guest OS type is not supported, run it as HVM
status 10483: resolved fixed
Conflicts:
	core/src/com/cloud/hypervisor/xen/resource/CitrixHelper.java
	core/src/com/cloud/hypervisor/xen/resource/XenServer60Resource.java 
						
						
					 
					
						2011-08-02 18:34:41 -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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							e0033c5d9d 
							
						 
					 
					
						
						
							
							bug 10869: always allocate first ip address from the range for the dhcp server.  
						
						 
						
						... 
						
						
						
						status 10869: resolved fixed
Here is the flow (design is approved by Will Chan):
1) If user specifies custom ip address, and this ip is not the first ip in the range, the dhcp server gets the ip.
2) If user specifies custom ip address, and this ip is the first ip in the range, the dhcp server will get the random ip address from the range.
2) If user doesn't specify custom ip address, we always try to allocate first ip address from the range for the dhcp server; if this ip is already allocated, the dhcp server will get the random ip from the range.
This will work for:
* domR's Guest network
* dhcp's Direct network 
						
						
					 
					
						2011-08-02 17:42:12 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							fc70e15059 
							
						 
					 
					
						
						
							
							fixed build  
						
						 
						
						
						
						
					 
					
						2011-08-02 17:24:22 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Chiradeep Vittal 
							
						 
					 
					
						
						
						
						
							
						
						
							e725c8ffeb 
							
						 
					 
					
						
						
							
							Ensure gc is slower, make some configs visible  
						
						 
						
						
						
						
					 
					
						2011-08-02 17:16:57 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							dc7ff2b5ad 
							
						 
					 
					
						
						
							
							Bug 10197:  
						
						 
						
						... 
						
						
						
						implement pool-wise VM sync,
    For XenServer, VM fullSync is pool-wise now, VM deltaSync is still per host 
						
						
					 
					
						2011-08-02 16:52:24 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							5f9884d97a 
							
						 
					 
					
						
						
							
							Bug 10197:  
						
						 
						
						... 
						
						
						
						1. don't try HA vms if host hypervisor version changes
    2. fixed a bug related to VM full sync with hosttrack enabled 
						
						
					 
					
						2011-08-02 16:48:27 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							21afd1785a 
							
						 
					 
					
						
						
							
							bug 10938: do search includingRemoved when generate the log for the vm state transition. The fix is needed for the specific case when expunge interval is really small, and vm gets expunged right after it's state transitioned to Destroyed, but before the log for state transition is generated  
						
						 
						
						... 
						
						
						
						status 10938: resolved fixed 
						
						
					 
					
						2011-08-02 16:10:23 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							f043f63eaa 
							
						 
					 
					
						
						
							
							Merged changes from 2.2.8.zucchini  
						
						 
						
						
						
						
					 
					
						2011-08-02 15:33:48 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Chiradeep Vittal 
							
						 
					 
					
						
						
						
						
							
						
						
							fd1dbe9683 
							
						 
					 
					
						
						
							
							bug 10884: do not lock if not necessary  
						
						 
						
						
						
						
					 
					
						2011-08-02 13:51:26 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							5c543ffdb1 
							
						 
					 
					
						
						
							
							bug 10884: fixed a bug where the security group keeps processing a vm that has been removed  
						
						 
						
						
						
						
					 
					
						2011-08-02 10:45:29 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							bdb44c6850 
							
						 
					 
					
						
						
							
							bug 10916: don't return removed entries when do listDiskOfferings by regular user  
						
						 
						
						... 
						
						
						
						status 10916: resolved fixed 
						
						
					 
					
						2011-08-02 09:46:17 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							dd7ba12949 
							
						 
					 
					
						
						
							
							bug 10916: don't return removed entries when do listDiskOfferings by regular user  
						
						 
						
						... 
						
						
						
						status 10916: resolved fixed 
						
						
					 
					
						2011-08-02 09:44:44 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							92b8b29fe4 
							
						 
					 
					
						
						
							
							Revert "sg improvements.  don't use global lock"  
						
						 
						
						... 
						
						
						
						This reverts commit 1d9961c588976a910d60c6420487c29a9080b73a. 
						
						
					 
					
						2011-08-02 03:49:30 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							79ddba246d 
							
						 
					 
					
						
						
							
							Revert "looks like lock tables don't return the tables locked"  
						
						 
						
						... 
						
						
						
						This reverts commit 76781c10f8534acdd6f81c46952f88ade941e269. 
						
						
					 
					
						2011-08-02 03:48:57 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Abhinandan Prateek 
							
						 
					 
					
						
						
						
						
							
						
						
							9009026eba 
							
						 
					 
					
						
						
							
							bug 10748: use external dns  
						
						 
						
						... 
						
						
						
						status 10748: resolved fixed 
						
						
					 
					
						2011-08-02 15:35:13 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Abhinandan Prateek 
							
						 
					 
					
						
						
						
						
							
						
						
							70b9769bd5 
							
						 
					 
					
						
						
							
							putting a check for domain name list  
						
						 
						
						
						
						
					 
					
						2011-08-02 15:22:49 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							91550836cf 
							
						 
					 
					
						
						
							
							looks like lock tables don't return the tables locked  
						
						 
						
						
						
						
					 
					
						2011-08-02 02:10:47 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Naredula Janardhana Reddy 
							
						 
					 
					
						
						
						
						
							
						
						
							b3b32fce9b 
							
						 
					 
					
						
						
							
							bug 10811: public_hostname and public_ipv4 are set same as that of local_hostname, local_ipv4 only for Basic network  
						
						 
						
						
						
						
					 
					
						2011-08-02 13:53:26 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Naredula Janardhana Reddy 
							
						 
					 
					
						
						
						
						
							
						
						
							a790e79f44 
							
						 
					 
					
						
						
							
							bug 10811: public_hostname and public_ipv4 are set same as that of local_hostname, local_ipv4  
						
						 
						
						
						
						
					 
					
						2011-08-02 13:52:47 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Abhinandan Prateek 
							
						 
					 
					
						
						
						
						
							
						
						
							4f3dec5f1c 
							
						 
					 
					
						
						
							
							bug 10812:  adding domain suffixes to zone's router conf  
						
						 
						
						
						
						
					 
					
						2011-08-02 11:34:38 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							6905a1db1d 
							
						 
					 
					
						
						
							
							sg improvements.  don't use global lock  
						
						 
						
						
						
						
					 
					
						2011-08-01 22:59:59 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Abhinandan Prateek 
							
						 
					 
					
						
						
						
						
							
						
						
							46be774ce8 
							
						 
					 
					
						
						
							
							bug 10812: adding domain suffixes to zone's router conf  
						
						 
						
						
						
						
					 
					
						2011-08-02 11:08:24 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							f150f68128 
							
						 
					 
					
						
						
							
							sg improvements  
						
						 
						
						
						
						
					 
					
						2011-08-01 22:09:41 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Chiradeep Vittal 
							
						 
					 
					
						
						
						
						
							
						
						
							efaa63a428 
							
						 
					 
					
						
						
							
							bug 10884: try out a global lock instead of per-vm locks  
						
						 
						
						
						
						
					 
					
						2011-08-01 18:52:06 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							a6a2383561 
							
						 
					 
					
						
						
							
							bug 10929: allow only OperationFailedToError event to trigger transition to Error state.  
						
						 
						
						
						
						
					 
					
						2011-08-01 18:38:14 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							40f42a784f 
							
						 
					 
					
						
						
							
							bug 10929: allow only OperationFailedToError event to trigger transition to Error state.  
						
						 
						
						
						
						
					 
					
						2011-08-01 18:33:02 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							f73c2695a1 
							
						 
					 
					
						
						
							
							bug 10927: instance_id is foreign key, not index, in port_forwarding_rules table  
						
						 
						
						
						
						
					 
					
						2011-08-01 17:25:25 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							5ffaed128d 
							
						 
					 
					
						
						
							
							bug 10927: added index for Removed field in create-schema  
						
						 
						
						
						
						
					 
					
						2011-08-01 17:11:59 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							7d02ed344e 
							
						 
					 
					
						
						
							
							Bug 10197: do not check timeout against cluster which is not managed  
						
						 
						
						
						
						
					 
					
						2011-08-01 17:00:58 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							1d5543ec79 
							
						 
					 
					
						
						
							
							Removed the key from upgrade-228-229.sql as we are adding it as a part of java code  
						
						 
						
						... 
						
						
						
						Fixed the typo in 2.2.8 to 2.2.9 upgrade 
						
						
					 
					
						2011-08-01 17:00:06 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							95d858d1f2 
							
						 
					 
					
						
						
							
							bug 10927: Drop key i_snapshots__removed (if exists) and readd it. Done to fix inconsistency between 2.1.x to 2.2.9 and 2.2.x to 2.2.9 upgrades  
						
						 
						
						
						
						
					 
					
						2011-08-01 16:22:06 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							270303e525 
							
						 
					 
					
						
						
							
							bug 10927: missing indexes in upgrade script  
						
						 
						
						
						
						
					 
					
						2011-08-01 16:19:22 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							5ba6d3fd3a 
							
						 
					 
					
						
						
							
							add scientific linux 6 and centos 6  
						
						 
						
						
						
						
					 
					
						2011-08-01 15:54:20 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							333e435fc5 
							
						 
					 
					
						
						
							
							bug 10927: added missing constraint to firewall_rules_cidr table  
						
						 
						
						
						
						
					 
					
						2011-08-01 15:52:44 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							d63426119e 
							
						 
					 
					
						
						
							
							Fixed db upgrade to do 228 to 229 when do upgrade from 224 branch  
						
						 
						
						... 
						
						
						
						Conflicts:
	server/src/com/cloud/upgrade/DatabaseUpgradeChecker.java 
						
						
					 
					
						2011-08-01 15:48:42 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							a0977ee61f 
							
						 
					 
					
						
						
							
							Fixed db upgrade to do 228 to 229 when do upgrade from 224 branch  
						
						 
						
						
						
						
					 
					
						2011-08-01 15:44:42 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Chiradeep Vittal 
							
						 
					 
					
						
						
						
						
							
						
						
							b4b87b1de8 
							
						 
					 
					
						
						
							
							bug 10920: avoid deadlocks by avoiding locks on the index on step  
						
						 
						
						
						
						
					 
					
						2011-08-01 15:32:23 -07:00