Nitin 
							
						 
					 
					
						
						
						
						
							
						
						
							d763d809cc 
							
						 
					 
					
						
						
							
							bug 10848: Introducing an api - ListCapacityByType. Add the basic DB layer in the command.  
						
						 
						
						
						
						
					 
					
						2011-08-09 18:12:37 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							bf13273889 
							
						 
					 
					
						
						
							
							adjust to merged changes  
						
						 
						
						
						
						
					 
					
						2011-08-08 18:46:00 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							02e64f90de 
							
						 
					 
					
						
						
							
							Add prepareTemplate command(admin only) to allow pre-loading template into primary storage  
						
						 
						
						
						
						
					 
					
						2011-08-08 18:45:47 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							455f9f642c 
							
						 
					 
					
						
						
							
							bug 11014:  
						
						 
						
						... 
						
						
						
						1. if there is no storage pool, don't try to start system VM
2. not use "consoleproxy.restart" as other meaning
status 11014: resolved fixed 
						
						
					 
					
						2011-08-08 18:31:14 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								frank 
							
						 
					 
					
						
						
						
						
							
						
						
							7e1fc2ca1a 
							
						 
					 
					
						
						
							
							Bug 8966 - Oracle VM (OVM) support  
						
						 
						
						... 
						
						
						
						OCFS2 support -- use cluster name as OCFS2 cluster name 
						
						
					 
					
						2011-08-08 18:22:43 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								frank 
							
						 
					 
					
						
						
						
						
							
						
						
							6969d95784 
							
						 
					 
					
						
						
							
							Introduce new resource life cycle listener  
						
						 
						
						
						
						
					 
					
						2011-08-08 17:05:27 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								frank 
							
						 
					 
					
						
						
						
						
							
						
						
							e8c2fa4e8e 
							
						 
					 
					
						
						
							
							Remove baremetal specific parameters from AddHostCmd  
						
						 
						
						
						
						
					 
					
						2011-08-08 15:01:26 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								frank 
							
						 
					 
					
						
						
						
						
							
						
						
							6aaf3d5ae0 
							
						 
					 
					
						
						
							
							Merge branch 'cvm'  
						
						 
						
						... 
						
						
						
						Conflicts:
	api/src/com/cloud/api/BaseCmd.java
	api/src/com/cloud/storage/Storage.java
	cloud.spec
	core/src/com/cloud/storage/template/DownloadManagerImpl.java
	server/src/com/cloud/agent/manager/AgentManagerImpl.java
	server/src/com/cloud/configuration/DefaultComponentLibrary.java
	server/src/com/cloud/deploy/FirstFitPlanner.java
	server/src/com/cloud/host/dao/HostDao.java
	server/src/com/cloud/storage/StorageManagerImpl.java
	server/src/com/cloud/vm/UserVmManagerImpl.java
	server/src/com/cloud/vm/VirtualMachineManagerImpl.java
	utils/src/com/cloud/utils/SerialVersionUID.java 
						
						
					 
					
						2011-08-08 14:14:09 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								frank 
							
						 
					 
					
						
						
						
						
							
						
						
							c89425325b 
							
						 
					 
					
						
						
							
							Bug 8966 - Oracle VM (OVM) support  
						
						 
						
						... 
						
						
						
						OCFS2 support -- add files 
						
						
					 
					
						2011-08-08 13:32:27 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								frank 
							
						 
					 
					
						
						
						
						
							
						
						
							c881bae64e 
							
						 
					 
					
						
						
							
							Bug 8966 - Oracle VM (OVM) support  
						
						 
						
						... 
						
						
						
						OCFS2 support -- use ComponentLocater to load OCFS2 manager 
						
						
					 
					
						2011-08-08 13:30:15 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nitin 
							
						 
					 
					
						
						
						
						
							
						
						
							01582fcd40 
							
						 
					 
					
						
						
							
							bug 10848: Introducing an api - ListCapacityByType.  
						
						 
						
						
						
						
					 
					
						2011-08-06 20:09:07 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								frank 
							
						 
					 
					
						
						
						
						
							
						
						
							c6fba0fd42 
							
						 
					 
					
						
						
							
							Bug 8966 - Oracle VM (OVM) support  
						
						 
						
						... 
						
						
						
						OCFS2 support -- prepare OCFS2 nodes 
						
						
					 
					
						2011-08-05 17:46:29 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								keshav 
							
						 
					 
					
						
						
						
						
							
						
						
							0165f915b6 
							
						 
					 
					
						
						
							
							Changed findOrCreateDhcpServers() to check if start IP is null before retrieving an IP address object  
						
						 
						
						
						
						
					 
					
						2011-08-05 16:54:03 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							6eacc11222 
							
						 
					 
					
						
						
							
							bug 10994: Fixed NPE in destroySystemVm api  
						
						 
						
						... 
						
						
						
						status 10994: resolved fixed 
						
						
					 
					
						2011-08-05 12:46:20 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							ee62361250 
							
						 
					 
					
						
						
							
							Fix missing lock releasing in VirtualNetworkApplianceManagerImpl.java  
						
						 
						
						
						
						
					 
					
						2011-08-05 12:15:20 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							12bd2180a1 
							
						 
					 
					
						
						
							
							bug 10991: Determine existing redundant router using both state and host id  
						
						 
						
						... 
						
						
						
						Seems in some condition, when a router is stopped, it's host_id != null.
status 10991: resolved fixed 
						
						
					 
					
						2011-08-05 11:37:13 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								kishan 
							
						 
					 
					
						
						
						
						
							
						
						
							695abd5c5a 
							
						 
					 
					
						
						
							
							bug 7826: Check for correct date range. Make DateFormat strict (turn off lenient)  
						
						 
						
						... 
						
						
						
						status 7826: resolved fixed 
						
						
					 
					
						2011-08-05 19:44:44 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nitin 
							
						 
					 
					
						
						
						
						
							
						
						
							c009b56a60 
							
						 
					 
					
						
						
							
							bug 6653: Extract Api's - No need to encode the url's forward slash with %2F as we have the latest version of gson which doesnt err out on forward slash anymore.  
						
						 
						
						... 
						
						
						
						status 6653: resolved fixed 
						
						
					 
					
						2011-08-05 18:44:41 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Abhinandan Prateek 
							
						 
					 
					
						
						
						
						
							
						
						
							59d5080718 
							
						 
					 
					
						
						
							
							bug 10969: name of VM is instance name, instead of display name  
						
						 
						
						... 
						
						
						
						status 10969: resolved fixed 
						
						
					 
					
						2011-08-05 13:18:42 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Abhinandan Prateek 
							
						 
					 
					
						
						
						
						
							
						
						
							dae2f4d958 
							
						 
					 
					
						
						
							
							bug 10748: fixed it when the VM acts as a dhcp server only  
						
						 
						
						... 
						
						
						
						status 10748: resolved fixed 
						
						
					 
					
						2011-08-05 12:07:59 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							d10c8e2a1d 
							
						 
					 
					
						
						
							
							bug 10765: fix step 2 - programming VNC server to let it chose the right keyboard mapping to load into  
						
						 
						
						
						
						
					 
					
						2011-08-04 18:30:50 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							83a9e74927 
							
						 
					 
					
						
						
							
							guard GlobalLock lock with finally clause  
						
						 
						
						
						
						
					 
					
						2011-08-04 16:20:31 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							7958ab566e 
							
						 
					 
					
						
						
							
							bug 10964: if snapshot's volume's templateId is NULL, change snapshot version from 2.1 to 2.2 directly, not upgrade snapshot is needed.  
						
						 
						
						... 
						
						
						
						status 10964: resolved fixed 
						
						
					 
					
						2011-08-04 16:09:22 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							5fbd0a7a5f 
							
						 
					 
					
						
						
							
							bug 9255: do NOT allow creating snapshot/snapshotpolicy against System VM volume  
						
						 
						
						... 
						
						
						
						status 9255: resolved fixed 
						
						
					 
					
						2011-08-04 15:32:45 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							c37d75fc00 
							
						 
					 
					
						
						
							
							release capacity if current state is in starting and not transit to running  
						
						 
						
						
						
						
					 
					
						2011-08-04 14:28:40 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							e5478457ee 
							
						 
					 
					
						
						
							
							don't put cpu/mem into reserved capacity if failed to start/stop vm  
						
						 
						
						
						
						
					 
					
						2011-08-04 14:28:33 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							354bc8f684 
							
						 
					 
					
						
						
							
							Fixed upgrade for volumes table  
						
						 
						
						
						
						
					 
					
						2011-08-04 11:22:14 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nitin 
							
						 
					 
					
						
						
						
						
							
						
						
							a3cb6d9a09 
							
						 
					 
					
						
						
							
							bug 9345: Remove pool_id from template_host_ref. Its not needed anymore. Also removed the unwarranted code.  
						
						 
						
						... 
						
						
						
						status 9345: resolved fixed 
						
						
					 
					
						2011-08-04 12:51:35 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							dfd0d7730e 
							
						 
					 
					
						
						
							
							bug 10954: when start a vm, always check if it's being started in original pod; if not - release old ip address, and allocate the new one from the new pod  
						
						 
						
						... 
						
						
						
						status 10954: resolved fixed 
						
						
					 
					
						2011-08-03 20:47:44 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							fc57860390 
							
						 
					 
					
						
						
							
							Send CheckRouter command only when router is running  
						
						 
						
						
						
						
					 
					
						2011-08-03 16:57:59 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								keshav 
							
						 
					 
					
						
						
						
						
							
						
						
							34a0c44f4f 
							
						 
					 
					
						
						
							
							Added a new table for inline load balancer deployments, to store mappings between public IPs and NICs.  
						
						 
						
						
						
						
					 
					
						2011-08-03 16:10:20 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							603de56c93 
							
						 
					 
					
						
						
							
							Merged fixes for 228-229 upgrade from 2.2.8 zucchini branch  
						
						 
						
						
						
						
					 
					
						2011-08-03 10:39:02 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Naredula Janardhana Reddy 
							
						 
					 
					
						
						
						
						
							
						
						
							954d8673c7 
							
						 
					 
					
						
						
							
							bug 10561: Allowing ICMP traffic through static NAT  
						
						 
						
						
						
						
					 
					
						2011-08-03 18:13:09 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nitin 
							
						 
					 
					
						
						
						
						
							
						
						
							c73f5da276 
							
						 
					 
					
						
						
							
							bug 10725: add checksum to listIso and registerIso (its an optional parameter for this command).  
						
						 
						
						... 
						
						
						
						status 10725: resolved fixed 
						
						
					 
					
						2011-08-03 17:41:29 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Abhinandan Prateek 
							
						 
					 
					
						
						
						
						
							
						
						
							bf0e761be1 
							
						 
					 
					
						
						
							
							checking domain list syntax  
						
						 
						
						
						
						
					 
					
						2011-08-03 14:45:23 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Abhinandan Prateek 
							
						 
					 
					
						
						
						
						
							
						
						
							f6303c13fb 
							
						 
					 
					
						
						
							
							bug 10812: putting key in ZoneConfig and other nomenclature changes  
						
						 
						
						
						
						
					 
					
						2011-08-03 14:42:29 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							64eeb8d79b 
							
						 
					 
					
						
						
							
							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:41:03 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							9df76d883d 
							
						 
					 
					
						
						
							
							fixed build  
						
						 
						
						
						
						
					 
					
						2011-08-02 17:32:03 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							37dcec77bb 
							
						 
					 
					
						
						
							
							Bug 10197:  
						
						 
						
						... 
						
						
						
						implement pool-wise VM sync,
    For XenServer, VM fullSync is pool-wise now, VM deltaSync is still per host
Conflicts:
	server/src/com/cloud/vm/VirtualMachineManagerImpl.java 
						
						
					 
					
						2011-08-02 17:31:36 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							bba811a714 
							
						 
					 
					
						
						
							
							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 17:29:16 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							bdbc16f081 
							
						 
					 
					
						
						
							
							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:14:20 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							9ad41d9fc8 
							
						 
					 
					
						
						
							
							bug 10916: don't return removed entries when do listDiskOfferings by regular user  
						
						 
						
						... 
						
						
						
						status 10916: resolved fixed 
						
						
					 
					
						2011-08-02 09:46:35 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nitin 
							
						 
					 
					
						
						
						
						
							
						
						
							09c26e5671 
							
						 
					 
					
						
						
							
							bug 10775: copyTemplate - Compute checksum at source from now on because the checksum might be referring to the compressed template. Send this checksum for comparison.  
						
						 
						
						
						
						
					 
					
						2011-08-02 20:30:10 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Abhinandan Prateek 
							
						 
					 
					
						
						
						
						
							
						
						
							2f804dd799 
							
						 
					 
					
						
						
							
							bug 10748: use external dns, configurable thru global param  
						
						 
						
						
						
						
					 
					
						2011-08-02 16:21:55 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Naredula Janardhana Reddy 
							
						 
					 
					
						
						
						
						
							
						
						
							580e8503cd 
							
						 
					 
					
						
						
							
							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:49:24 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Naredula Janardhana Reddy 
							
						 
					 
					
						
						
						
						
							
						
						
							2af0b22703 
							
						 
					 
					
						
						
							
							bug 10811: public_hostname and public_ipv4 are set same as that of local_hostname, local_ipv4  
						
						 
						
						
						
						
					 
					
						2011-08-02 13:28:44 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Abhinandan Prateek 
							
						 
					 
					
						
						
						
						
							
						
						
							5cb3882349 
							
						 
					 
					
						
						
							
							bug 10812: adding domain suffixes to zone's router conf  
						
						 
						
						
						
						
					 
					
						2011-08-02 11:23:33 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							04528c821b 
							
						 
					 
					
						
						
							
							bug 10929: allow only OperationFailedToError event to trigger transition to Error state.  
						
						 
						
						
						
						
					 
					
						2011-08-01 18:40:29 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							80684861cf 
							
						 
					 
					
						
						
							
							Bug 10197: do not check timeout against cluster which is not managed  
						
						 
						
						
						
						
					 
					
						2011-08-01 17:01:22 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							d30fe74794 
							
						 
					 
					
						
						
							
							Added 229 to 2210 upgrade path  
						
						 
						
						
						
						
					 
					
						2011-08-01 15:42:16 -07:00