Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							d9b0188d7e 
							
						 
					 
					
						
						
							
							Fix potential redundant router FAULT state by dnsmasq  
						
						 
						
						... 
						
						
						
						This message may show during redundant router start up:
FAULT (Restarting DNS forwarder and DHCP server: dnsmasq failed!)
This caused by edithost.sh is racy with keepalived process. They both want to
restart dnsmasq.
Even in normal condition, it's very hard to reproduce this bug. Add file lock
for edithost.sh should solve it. 
						
						
					 
					
						2011-08-19 16:11:33 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							977543a007 
							
						 
					 
					
						
						
							
							Fix potential redundant router FAULT state by dnsmasq  
						
						 
						
						... 
						
						
						
						This message may show during redundant router start up:
FAULT (Restarting DNS forwarder and DHCP server: dnsmasq failed!)
This caused by edithost.sh is racy with keepalived process. They both want to
restart dnsmasq.
Even in normal condition, it's very hard to reproduce this bug. Add file lock
for edithost.sh should solve it. 
						
						
					 
					
						2011-08-19 16:09:45 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								frank 
							
						 
					 
					
						
						
						
						
							
						
						
							18f87c2108 
							
						 
					 
					
						
						
							
							Merge branch 'cvm' into 2.2.y  
						
						 
						
						... 
						
						
						
						Conflicts:
	api/src/com/cloud/api/BaseCmd.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/network/security/SecurityGroupListener.java
	server/src/com/cloud/storage/StorageManagerImpl.java
	server/src/com/cloud/storage/listener/StoragePoolMonitor.java
	server/src/com/cloud/vm/UserVmManagerImpl.java
	server/src/com/cloud/vm/VirtualMachineManagerImpl.java
	utils/src/com/cloud/utils/SerialVersionUID.java 
						
						
					 
					
						2011-08-19 16:08:35 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							56244c7c47 
							
						 
					 
					
						
						
							
							release the check  
						
						 
						
						
						
						
					 
					
						2011-08-19 16:07:55 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							de25a63ba8 
							
						 
					 
					
						
						
							
							release the check  
						
						 
						
						
						
						
					 
					
						2011-08-19 16:06:13 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							0cce5c44c2 
							
						 
					 
					
						
						
							
							bug 10790: cloudStack - Volume page - hide Storage from domain-admin as well.  
						
						 
						
						
						
						
					 
					
						2011-08-19 15:05:45 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							a796b2b1b7 
							
						 
					 
					
						
						
							
							bug 10790: cloudStack - Volume page - hide Storage from domain-admin as well.  
						
						 
						
						
						
						
					 
					
						2011-08-19 15:04:39 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							5696543359 
							
						 
					 
					
						
						
							
							disable attach volume to a vm if volume state is not in allocated or ready state  
						
						 
						
						
						
						
					 
					
						2011-08-19 14:27:13 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							1c49481305 
							
						 
					 
					
						
						
							
							disable attach volume to a vm if volume state is not in allocated or ready state  
						
						 
						
						
						
						
					 
					
						2011-08-19 14:26:47 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							301a5f7bcc 
							
						 
					 
					
						
						
							
							bug 11175: cloudStack - convert firewallRuleUiEnabled from boolean to string before saving to cookie.  
						
						 
						
						
						
						
					 
					
						2011-08-19 13:49:47 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							eada883b5e 
							
						 
					 
					
						
						
							
							bug 11183: put volume state into "Creating" state if it's created from snapshot.  
						
						 
						
						... 
						
						
						
						status 11183: resolved fixed 
						
						
					 
					
						2011-08-19 13:46:51 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							8bbed3caea 
							
						 
					 
					
						
						
							
							bug 11183: put volume state into "Creating" state if it's created from snapshot.  
						
						 
						
						... 
						
						
						
						status 11183: resolved fixed 
						
						
					 
					
						2011-08-19 13:45:35 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							b1f0d8d6c0 
							
						 
					 
					
						
						
							
							bug 11175: cloudStack - convert firewallRuleUiEnabled from boolean to string before saving to cookie.  
						
						 
						
						
						
						
					 
					
						2011-08-19 13:36:00 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							3822192879 
							
						 
					 
					
						
						
							
							bug 11176: cloudStack - IP Address page - Firewall tab - add firewall rule - (1) Hide ICMP Type, ICMP Code when protocol TCP or UDP is selected. (2) Hide Start Port, End Port when protocol ICMP is selected.  
						
						 
						
						
						
						
					 
					
						2011-08-19 13:13:21 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							b60ee0df37 
							
						 
					 
					
						
						
							
							bug 11176: cloudStack - IP Address page - Firewall tab - add firewall rule - (1) Hide ICMP Type, ICMP Code when protocol TCP or UDP is selected. (2) Hide Start Port, End Port when protocol ICMP is selected.  
						
						 
						
						
						
						
					 
					
						2011-08-19 13:12:12 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							3a7d79a91e 
							
						 
					 
					
						
						
							
							bug 11175: cloudStack - IP address page - fix the logic of showing/hiding Firewall tab for Static NAT IP.  
						
						 
						
						
						
						
					 
					
						2011-08-19 11:31:28 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							abce057d7e 
							
						 
					 
					
						
						
							
							bug 11175: cloudStack - IP address page - fix the logic of showing/hiding Firewall tab for Static NAT IP.  
						
						 
						
						
						
						
					 
					
						2011-08-19 11:30:07 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							18255e985c 
							
						 
					 
					
						
						
							
							add apikey/securitykey in cloud-cli  
						
						 
						
						
						
						
					 
					
						2011-08-19 11:23:30 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							b5d1ca34c1 
							
						 
					 
					
						
						
							
							add apikey/securitykey in cloud-cli  
						
						 
						
						
						
						
					 
					
						2011-08-19 11:22:42 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							6ec4a6c3b4 
							
						 
					 
					
						
						
							
							bug 11175: cloudStack - IP address page - fix the logic of showing/hiding Firewall tab.  
						
						 
						
						
						
						
					 
					
						2011-08-19 11:10:53 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							a9b02d8895 
							
						 
					 
					
						
						
							
							bug 11175: cloudStack - IP address page - fix the logic of showing/hiding Firewall tab.  
						
						 
						
						
						
						
					 
					
						2011-08-19 11:08:43 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Abhinandan Prateek 
							
						 
					 
					
						
						
						
						
							
						
						
							8d4c7208a4 
							
						 
					 
					
						
						
							
							bug 11094: delinking api layer objects from dao layer  
						
						 
						
						
						
						
					 
					
						2011-08-19 15:23:49 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Abhinandan Prateek 
							
						 
					 
					
						
						
						
						
							
						
						
							601708c3e6 
							
						 
					 
					
						
						
							
							bug 11094: delinking api layer objects from dao layer  
						
						 
						
						
						
						
					 
					
						2011-08-19 15:21:03 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							843e41752f 
							
						 
					 
					
						
						
							
							Update redundant router status even router is down  
						
						 
						
						... 
						
						
						
						We need to update the status to UNKNOWN if router is down(also ensure we can't
contact the router if the state is Stopped in our database). 
						
						
					 
					
						2011-08-18 22:51:23 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							a961dd913f 
							
						 
					 
					
						
						
							
							Update redundant router status even router is down  
						
						 
						
						... 
						
						
						
						We need to update the status to UNKNOWN if router is down(also ensure we can't
contact the router if the state is Stopped in our database). 
						
						
					 
					
						2011-08-18 22:51:13 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							b34750c6ff 
							
						 
					 
					
						
						
							
							Update redundant router status even router is down  
						
						 
						
						... 
						
						
						
						We need to update the status to UNKNOWN if router is down(also ensure we can't
contact the router if the state is Stopped in our database). 
						
						
					 
					
						2011-08-18 22:49:51 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Naredula Janardhana Reddy 
							
						 
					 
					
						
						
						
						
							
						
						
							4369b0ba96 
							
						 
					 
					
						
						
							
							bug 1067:  
						
						 
						
						... 
						
						
						
						- covered basic impelementation for xen, need to test corner cases.
      - Not implemneted: kvm, vmware , listing of egress rules. 
						
						
					 
					
						2011-08-19 11:10:16 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							2c1df02ba1 
							
						 
					 
					
						
						
							
							Removed unused imports  
						
						 
						
						
						
						
					 
					
						2011-08-18 15:02:04 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							e8a62cc4a9 
							
						 
					 
					
						
						
							
							add security table  
						
						 
						
						
						
						
					 
					
						2011-08-18 11:38:26 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							bdb325609d 
							
						 
					 
					
						
						
							
							simulate more commands  
						
						 
						
						
						
						
					 
					
						2011-08-18 11:38:18 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							df6bee4061 
							
						 
					 
					
						
						
							
							add template for simulator  
						
						 
						
						
						
						
					 
					
						2011-08-18 11:37:50 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							ea102aa045 
							
						 
					 
					
						
						
							
							add host guid in migrate command  
						
						 
						
						
						
						
					 
					
						2011-08-18 11:03:40 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							c57ca25d2a 
							
						 
					 
					
						
						
							
							need to update configuration  
						
						 
						
						
						
						
					 
					
						2011-08-18 10:51:50 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							97e9a0171a 
							
						 
					 
					
						
						
							
							change parameters  
						
						 
						
						
						
						
					 
					
						2011-08-18 10:51:44 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							c707aeb5da 
							
						 
					 
					
						
						
							
							add more test cases  
						
						 
						
						
						
						
					 
					
						2011-08-18 10:51:38 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							8fc6e18f46 
							
						 
					 
					
						
						
							
							fix typo  
						
						 
						
						
						
						
					 
					
						2011-08-18 10:51:34 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							1bc7631bf2 
							
						 
					 
					
						
						
							
							finally, test framework works now  
						
						 
						
						
						
						
					 
					
						2011-08-18 10:51:31 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							48494c5f20 
							
						 
					 
					
						
						
							
							generate json configuration file for any kind of data center setup, and deploy it  
						
						 
						
						
						
						
					 
					
						2011-08-18 10:49:18 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							1600d70ca3 
							
						 
					 
					
						
						
							
							fix code generator, some api response is empty  
						
						 
						
						
						
						
					 
					
						2011-08-18 10:49:18 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							6349b63942 
							
						 
					 
					
						
						
							
							Use row lock instead of global lock when creating a new domain  
						
						 
						
						
						
						
					 
					
						2011-08-18 10:42:12 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							9c47f6bd94 
							
						 
					 
					
						
						
							
							Use row lock instead of global lock when creating a new domain  
						
						 
						
						
						
						
					 
					
						2011-08-18 10:41:49 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							e9c879fbb8 
							
						 
					 
					
						
						
							
							Use row lock instead of global lock when creating a new domain  
						
						 
						
						
						
						
					 
					
						2011-08-18 10:40:53 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							0afa6f052f 
							
						 
					 
					
						
						
							
							bug 11167: no need to lock account when create security group to ensure that the group name is unique for account. If group already exists in the db, and we try to persist it again, mysql constraint (groupName, accountId) will fail and exception will be thrown.  
						
						 
						
						... 
						
						
						
						status 11167: resolved fixed 
						
						
					 
					
						2011-08-18 10:16:37 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							0cdb67fdc7 
							
						 
					 
					
						
						
							
							bug 11167: no need to lock account when create security group to ensure that the group name is unique for account. If group already exists in the db, and we try to persist it again, mysql constraint (groupName, accountId) will fail and exception will be thrown.  
						
						 
						
						... 
						
						
						
						status 11167: resolved fixed 
						
						
					 
					
						2011-08-18 10:16:20 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							b36241690c 
							
						 
					 
					
						
						
							
							bug 11167: no need to lock account when create security group to ensure that the group name is unique for account. If group already exists in the db, and we try to persist it again, mysql constraint (groupName, accountId) will fail and exception will be thrown.  
						
						 
						
						... 
						
						
						
						status 11167: resolved fixed 
						
						
					 
					
						2011-08-18 10:15:15 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								frank 
							
						 
					 
					
						
						
						
						
							
						
						
							035001bd19 
							
						 
					 
					
						
						
							
							Fix baremetal planner reply to non-baremetal VM when migration  
						
						 
						
						
						
						
					 
					
						2011-08-18 10:14:40 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								frank 
							
						 
					 
					
						
						
						
						
							
						
						
							523a32edaa 
							
						 
					 
					
						
						
							
							Fix baremetal planner reply to non-baremetal VM when migration  
						
						 
						
						
						
						
					 
					
						2011-08-18 10:14:16 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								frank 
							
						 
					 
					
						
						
						
						
							
						
						
							a37573b842 
							
						 
					 
					
						
						
							
							Fix baremetal planner reply to non-baremetal VM when migration  
						
						 
						
						
						
						
					 
					
						2011-08-18 10:11:51 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Abhinandan Prateek 
							
						 
					 
					
						
						
						
						
							
						
						
							c2a769d993 
							
						 
					 
					
						
						
							
							fixed execptions while adding second host  
						
						 
						
						
						
						
					 
					
						2011-08-18 16:28:19 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Abhinandan Prateek 
							
						 
					 
					
						
						
						
						
							
						
						
							2df6e5cc69 
							
						 
					 
					
						
						
							
							fixed execptions while adding second host  
						
						 
						
						
						
						
					 
					
						2011-08-18 16:26:00 +05:30