alena
							
						 
					 | 
					
						
						
						
						
							
						
						
							0d2787e2db
							
						
					 | 
					
						
						
							
							bug 4706: allow to specify which ip address from the network to take when do vm deployment. The model is supported for multiple network case as well.
						
						
						
						
						
						
						
						status 4706: resolved fixed
Merge from master to 2.2.8 branch
Conflicts:
	api/src/com/cloud/api/ApiConstants.java
	server/src/com/cloud/network/NetworkManager.java
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/guru/GuestNetworkGuru.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
	server/src/com/cloud/vm/UserVmManagerImpl.java 
						
						
							
						
					 | 
					
						2011-07-15 14:20:52 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Kelven Yang
							
						 
					 | 
					
						
						
						
						
							
						
						
							06ea7338a8
							
						
					 | 
					
						
						
							
							bug 10732: fix console proxy assignment issue - file was not saved, commit again
						
						
						
						
						
						
							
 tag-2.2.8
						
					 | 
					
						2011-07-14 21:56:51 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Kelven Yang
							
						 
					 | 
					
						
						
						
						
							
						
						
							1081a3cfaa
							
						
					 | 
					
						
						
							
							bug 10732: fix console proxy assignment issue
						
						
						
						
						
						
							
						
					 | 
					
						2011-07-14 21:56:34 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								anthony
							
						 
					 | 
					
						
						
						
						
							
						
						
							18003deedf
							
						
					 | 
					
						
						
							
							bug 10628: root cause is CheckHealthCommand return false, XenServerInvestigator is not called
						
						
						
						
						
						
						
						status 10628: resolved fixed 
						
						
							
						
					 | 
					
						2011-07-14 20:42:26 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Kelven Yang
							
						 
					 | 
					
						
						
						
						
							
						
						
							61676ff3ea
							
						
					 | 
					
						
						
							
							Make cluster request timeout to be configurable
						
						
						
						
						
						
							
						
					 | 
					
						2011-07-14 18:11:32 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								alena
							
						 
					 | 
					
						
						
						
						
							
						
						
							d11ac32f08
							
						
					 | 
					
						
						
							
							bug 10727: fixed duplicated usage event generation when create volume from snapshot
						
						
						
						
						
						
						
						status 10727: resolved fixed 
						
						
							
						
					 | 
					
						2011-07-14 10:28:28 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nitin
							
						 
					 | 
					
						
						
						
						
							
						
						
							1a6d859f22
							
						
					 | 
					
						
						
							
							bug 10718: checkSumSync - remove it as we dont require it.
						
						
						
						
						
						
						
						status 10718: resolved fixed 
						
						
							
						
					 | 
					
						2011-07-14 16:48:42 +05:30 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								anthony
							
						 
					 | 
					
						
						
						
						
							
						
						
							b9803a05ae
							
						
					 | 
					
						
						
							
							bug 10705: don't need to print trace
						
						
						
						
						
						
						
						status 10705: resolved fixed 
						
						
							
						
					 | 
					
						2011-07-13 18:35:56 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								anthony
							
						 
					 | 
					
						
						
						
						
							
						
						
							b6d4c3e86d
							
						
					 | 
					
						
						
							
							bug 10691: expand try-catch, and add more log
						
						
						
						
						
						
							
						
					 | 
					
						2011-07-13 18:24:14 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								alena
							
						 
					 | 
					
						
						
						
						
							
						
						
							25206e6257
							
						
					 | 
					
						
						
							
							bug 10681: for serviceOfferings, diskOfferings, templates/isos return records with not null Removed field on findById method call
						
						
						
						
						
						
						
						status 10681: resolved fixed 
						
						
							
						
					 | 
					
						2011-07-13 17:16:07 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Kelven Yang
							
						 
					 | 
					
						
						
						
						
							
						
						
							398cea40e1
							
						
					 | 
					
						
						
							
							bug 10702: add data migration for 2.2.7 to 2.2.8 migration
						
						
						
						
						
						
							
						
					 | 
					
						2011-07-13 13:48:19 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								anthony
							
						 
					 | 
					
						
						
						
						
							
						
						
							72b405948b
							
						
					 | 
					
						
						
							
							bug 10691: add more log
						
						
						
						
						
						
							
						
					 | 
					
						2011-07-13 11:47:58 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Alex Huang
							
						 
					 | 
					
						
						
						
						
							
						
						
							b54edececf
							
						
					 | 
					
						
						
							
							resolved a bug where the wrong msid was used in releasing locks
						
						
						
						
						
						
							
						
					 | 
					
						2011-07-13 09:52:35 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Alex Huang
							
						 
					 | 
					
						
						
						
						
							
						
						
							5619f0490c
							
						
					 | 
					
						
						
							
							added more locking logging
						
						
						
						
						
						
							
						
					 | 
					
						2011-07-13 09:29:38 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Kelven Yang
							
						 
					 | 
					
						
						
						
						
							
						
						
							11527ad914
							
						
					 | 
					
						
						
							
							bug 10699: log on listener registration
						
						
						
						
						
						
							
						
					 | 
					
						2011-07-12 16:58:55 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Kelven Yang
							
						 
					 | 
					
						
						
						
						
							
						
						
							280a93a83d
							
						
					 | 
					
						
						
							
							bug 10699: more log for this
						
						
						
						
						
						
							
						
					 | 
					
						2011-07-12 16:14:58 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Kelven Yang
							
						 
					 | 
					
						
						
						
						
							
						
						
							40145b0b8b
							
						
					 | 
					
						
						
							
							add logging to clustering notification
						
						
						
						
						
						
							
						
					 | 
					
						2011-07-12 16:14:58 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sheng Yang
							
						 
					 | 
					
						
						
						
						
							
						
						
							8725257f6b
							
						
					 | 
					
						
						
							
							bug 10692: Fix the limitation of SSL packet is 16k using compression
						
						
						
						
						
						
							
						
					 | 
					
						2011-07-12 13:09:52 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								anthony
							
						 
					 | 
					
						
						
						
						
							
						
						
							67d51edbd3
							
						
					 | 
					
						
						
							
							bug 10690: add "live" option to migrate
						
						
						
						
						
						
						
						status 10690: resolved fixed 
						
						
							
						
					 | 
					
						2011-07-11 19:35:28 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								alena
							
						 
					 | 
					
						
						
						
						
							
						
						
							73574ebf5b
							
						
					 | 
					
						
						
							
							Do regular vm stop (not forced=true) when disableAccount
						
						
						
						
						
						
							
						
					 | 
					
						2011-07-11 17:35:35 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								anthony
							
						 
					 | 
					
						
						
						
						
							
						
						
							0e9d1a8d1d
							
						
					 | 
					
						
						
							
							bug 10688: if the template is not installed in the primary storage, the asking zie is doubled, fixed by using physical size for template
						
						
						
						
						
						
						
						status 10688: resolved fixed 
						
						
							
						
					 | 
					
						2011-07-11 17:28:30 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								alena
							
						 
					 | 
					
						
						
						
						
							
						
						
							cc9a629cea
							
						
					 | 
					
						
						
							
							bug 10686: generate volume.delete usage event (along with vm.destroy) when vm fails to create/start.
						
						
						
						
						
						
						
						status 10686: resolved fixed
Also updated 227 to 228 db upgrade to insert missing usage_event records 
						
						
							
						
					 | 
					
						2011-07-11 16:11:05 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jessica Wang
							
						 
					 | 
					
						
						
						
						
							
						
						
							140d872259
							
						
					 | 
					
						
						
							
							cloudStack - UserVM page - Stop VM action - add option "Force Stop".
						
						
						
						
						
						
							
						
					 | 
					
						2011-07-11 15:50:47 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								frank
							
						 
					 | 
					
						
						
						
						
							
						
						
							5a9233f4ea
							
						
					 | 
					
						
						
							
							Bug 10679 - increase file descriptor limit to 4096
						
						
						
						
						
						
						
						Resolved fixed 
						
						
							
						
					 | 
					
						2011-07-11 15:06:51 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Alex Huang
							
						 
					 | 
					
						
						
						
						
							
						
						
							f5d5ed5dce
							
						
					 | 
					
						
						
							
							put big log trace in firstfit planner in to trace instead of debug
						
						
						
						
						
						
							
						
					 | 
					
						2011-07-11 14:37:36 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Alex Huang
							
						 
					 | 
					
						
						
						
						
							
						
						
							b9d4d65714
							
						
					 | 
					
						
						
							
							more logging to figure out problems with gson
						
						
						
						
						
						
							
						
					 | 
					
						2011-07-11 14:18:12 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								frank
							
						 
					 | 
					
						
						
						
						
							
						
						
							93c55c2823
							
						
					 | 
					
						
						
							
							Bug 10679 - increase file descriptor limit to 4096
						
						
						
						
						
						
						
						Resolved fixed 
						
						
							
						
					 | 
					
						2011-07-11 12:18:53 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Kelven Yang
							
						 
					 | 
					
						
						
						
						
							
						
						
							b9f00ccbab
							
						
					 | 
					
						
						
							
							bug 10677: add client side time out to cluster servlet interface
						
						
						
						
						
						
							
						
					 | 
					
						2011-07-11 12:08:12 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sheng Yang
							
						 
					 | 
					
						
						
						
						
							
						
						
							a2de0f60d5
							
						
					 | 
					
						
						
							
							Move disconnect log to TRACE level
						
						
						
						
						
						
							
						
					 | 
					
						2011-07-11 11:08:40 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sheng Yang
							
						 
					 | 
					
						
						
						
						
							
						
						
							612f776892
							
						
					 | 
					
						
						
							
							Fix keystore loading path
						
						
						
						
						
						
							
						
					 | 
					
						2011-07-11 10:59:04 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								alena
							
						 
					 | 
					
						
						
						
						
							
						
						
							98b728bf70
							
						
					 | 
					
						
						
							
							Fixed typo
						
						
						
						
						
						
							
						
					 | 
					
						2011-07-11 10:31:25 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								alena
							
						 
					 | 
					
						
						
						
						
							
						
						
							edb68eb6b7
							
						
					 | 
					
						
						
							
							More logging to agent lb
						
						
						
						
						
						
							
						
					 | 
					
						2011-07-11 10:29:57 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sheng Yang
							
						 
					 | 
					
						
						
						
						
							
						
						
							964cef3767
							
						
					 | 
					
						
						
							
							Update keystore generation cmdline
						
						
						
						
						
						
							
						
					 | 
					
						2011-07-11 10:18:39 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chiradeep Vittal
							
						 
					 | 
					
						
						
						
						
							
						
						
							7d95efb7c6
							
						
					 | 
					
						
						
							
							fix ipset problem introduced by 58e92bbe84c2a61ef72913dcb4a88cd761c89604
						
						
						
						
						
						
							
						
					 | 
					
						2011-07-10 12:44:15 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Alex Huang
							
						 
					 | 
					
						
						
						
						
							
						
						
							fb8c3c032a
							
						
					 | 
					
						
						
							
							find templates that are not removed
						
						
						
						
						
						
							
						
					 | 
					
						2011-07-09 13:37:26 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Alex Huang
							
						 
					 | 
					
						
						
						
						
							
						
						
							26b3c26974
							
						
					 | 
					
						
						
							
							got rid of dos eol which seems to confuse jdk in generating line numbers
						
						
						
						
						
						
							
						
					 | 
					
						2011-07-09 13:35:06 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Alex Huang
							
						 
					 | 
					
						
						
						
						
							
						
						
							e5994a6485
							
						
					 | 
					
						
						
							
							added logging for the gson error
						
						
						
						
						
						
							
						
					 | 
					
						2011-07-09 10:58:14 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Alex Huang
							
						 
					 | 
					
						
						
						
						
							
						
						
							db5afa4994
							
						
					 | 
					
						
						
							
							fix migration npe when recovering
						
						
						
						
						
						
							
						
					 | 
					
						2011-07-09 08:31:44 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sheng Yang
							
						 
					 | 
					
						
						
						
						
							
						
						
							e8f317243f
							
						
					 | 
					
						
						
							
							SSL: Fix leaking file descriptor
						
						
						
						
						
						
						
						And bad connection fail handling. 
						
						
							
						
					 | 
					
						2011-07-08 22:04:34 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								alena
							
						 
					 | 
					
						
						
						
						
							
						
						
							864a04ea6d
							
						
					 | 
					
						
						
							
							bug 10671: list domain level networks for children domains when domainId is not specified
						
						
						
						
						
						
						
						status 10671: resolved fixed 
						
						
							
						
					 | 
					
						2011-07-08 21:17:32 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sheng Yang
							
						 
					 | 
					
						
						
						
						
							
						
						
							0f09546d04
							
						
					 | 
					
						
						
							
							Fix Class cast issue
						
						
						
						
						
						
							
						
					 | 
					
						2011-07-08 20:34:12 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sheng Yang
							
						 
					 | 
					
						
						
						
						
							
						
						
							8ada2852bf
							
						
					 | 
					
						
						
							
							Suppress connection error messages
						
						
						
						
						
						
						
						Load balancers would trigger this error message again and again.. Put them in to
debug/trace level, instread of showing a calltrace. 
						
						
							
						
					 | 
					
						2011-07-08 18:12:29 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Kelven Yang
							
						 
					 | 
					
						
						
						
						
							
						
						
							72cbd65db2
							
						
					 | 
					
						
						
							
							bug 10668: add DB upgrade scripts for 2.2.7 to 2.2.8 upgrade
						
						
						
						
						
						
							
						
					 | 
					
						2011-07-08 18:12:13 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								anthony
							
						 
					 | 
					
						
						
						
						
							
						
						
							dda3f220d6
							
						
					 | 
					
						
						
							
							bug 10669: it is due to there is a templatehostref for this template, whose status is not DOWNLOADED
						
						
						
						
						
						
						
						fixed by only check ready templatehostref for ISO download
status 10669: resolved fixed 
						
						
							
						
					 | 
					
						2011-07-08 17:37:34 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								alena
							
						 
					 | 
					
						
						
						
						
							
						
						
							9db9d3f36f
							
						
					 | 
					
						
						
							
							When release public ip address, make a search by ip+networkId instead of ip+accountId as ipAddress is unique in network only.
						
						
						
						
						
						
							
						
					 | 
					
						2011-07-08 15:55:15 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								frank
							
						 
					 | 
					
						
						
						
						
							
						
						
							7b1b56548a
							
						
					 | 
					
						
						
							
							Bug 10660 - ConfigurationServer loads failed because DB upgrade happens after it
						
						
						
						
						
						
						
						resolved fixed 
						
						
							
 tag-2.2.8.RC2
						
					 | 
					
						2011-07-08 14:49:50 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jessica Wang
							
						 
					 | 
					
						
						
						
						
							
						
						
							9f8e129b01
							
						
					 | 
					
						
						
							
							cloudStack - secondary storage page - remove Version grid row.
						
						
						
						
						
						
							
						
					 | 
					
						2011-07-08 14:45:51 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Alex Huang
							
						 
					 | 
					
						
						
						
						
							
						
						
							b23c2a3c53
							
						
					 | 
					
						
						
							
							bug 10447: don't set the reservation id to null
						
						
						
						
						
						
							
						
					 | 
					
						2011-07-08 11:36:30 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Kelven Yang
							
						 
					 | 
					
						
						
						
						
							
						
						
							97cdf2eccd
							
						
					 | 
					
						
						
							
							bug 10618: another place that could possibly throw NPE
						
						
						
						
						
						
							
						
					 | 
					
						2011-07-08 09:54:22 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								alena
							
						 
					 | 
					
						
						
						
						
							
						
						
							70b1c69ef3
							
						
					 | 
					
						
						
							
							bug 10651: added missing keys to 227 to 228 db upgrade
						
						
						
						
						
						
						
						status 10651: resolved fixed 
						
						
							
						
					 | 
					
						2011-07-08 09:45:12 -07:00 | 
					
					
						
						
							
							
							
						
					 |