Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							5f3bb36650 
							
						 
					 
					
						
						
							
							1) Merge following change from 2.1.X  
						
						 
						
						... 
						
						
						
						Add time stamped ticket to console access URL to make it more secure
2) Fix a problem caused by the inconsistency of using different path seperator between windows platform and linux platform 
						
						
					 
					
						2010-10-04 15:31:05 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								edison 
							
						 
					 
					
						
						
						
						
							
						
						
							d370ae6a32 
							
						 
					 
					
						
						
							
							Merge branch 'master' of ssh://git.cloud.com/var/lib/git/cloudstack-oss  
						
						 
						
						
						
						
					 
					
						2010-10-04 14:48:40 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								edison 
							
						 
					 
					
						
						
						
						
							
						
						
							3d9f25e903 
							
						 
					 
					
						
						
							
							bug 1974: add upgraderoutercmd to upgrade router vm's service offering  
						
						 
						
						... 
						
						
						
						status 1974: resolved fixed
It's a synced API, which just update router vm's service offering,
parameter: router id, service offering id,
return: ture on successfull, otherwise false 
						
						
					 
					
						2010-10-04 14:45:28 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							652d86956c 
							
						 
					 
					
						
						
							
							more files checked in  
						
						 
						
						
						
						
					 
					
						2010-10-04 12:04:59 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							21d523402f 
							
						 
					 
					
						
						
							
							in premium, use async vdi.copy API, avoid time out  
						
						 
						
						
						
						
					 
					
						2010-10-01 17:22:07 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							f433a4d360 
							
						 
					 
					
						
						
							
							bug 6363:  
						
						 
						
						... 
						
						
						
						1. delete local storage when delete host
    2. delete host detail when delete host
    3. allow one host in maintance mode in a cluster instead of in a pod
    status 6363: resolved fixed 
						
						
					 
					
						2010-10-01 10:40:08 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								edison 
							
						 
					 
					
						
						
						
						
							
						
						
							b441deec94 
							
						 
					 
					
						
						
							
							Need to set all the system vms as read state  
						
						 
						
						
						
						
					 
					
						2010-09-30 20:39:34 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								edison 
							
						 
					 
					
						
						
						
						
							
						
						
							b467faf826 
							
						 
					 
					
						
						
							
							fix typo about guest os mapping  
						
						 
						
						
						
						
					 
					
						2010-09-30 18:37:08 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								edison 
							
						 
					 
					
						
						
						
						
							
						
						
							23e0b2ce29 
							
						 
					 
					
						
						
							
							bug 6365: xenserver and xcp need different guest os mapper  
						
						 
						
						... 
						
						
						
						status 6365: resolved fixed 
						
						
					 
					
						2010-09-30 18:18:49 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							2c5723d26c 
							
						 
					 
					
						
						
							
							bug 6329: skip removed storage pool  
						
						 
						
						... 
						
						
						
						status 6329: resolved fixed 
						
						
					 
					
						2010-09-30 12:40:53 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								edison 
							
						 
					 
					
						
						
						
						
							
						
						
							26807bc701 
							
						 
					 
					
						
						
							
							bug 6362: Need to call guestos.getDisplayName to the guest os name now.  
						
						 
						
						... 
						
						
						
						status 6362: resolved fixed 
						
						
					 
					
						2010-09-30 12:26:37 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								edison 
							
						 
					 
					
						
						
						
						
							
						
						
							7615f569ff 
							
						 
					 
					
						
						
							
							after rebase, fix bugs  
						
						 
						
						
						
						
					 
					
						2010-09-29 18:41:55 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								edison 
							
						 
					 
					
						
						
						
						
							
						
						
							ad1ef80459 
							
						 
					 
					
						
						
							
							Now we have multiple routing template and buitin templates now, refactor template download code, that can handle it.  
						
						 
						
						... 
						
						
						
						Basically, change the meaning of type field in template table: SYSTEM means sytem vm template, BUILIIN means buildin templates. 
						
						
					 
					
						2010-09-29 18:41:55 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								edison 
							
						 
					 
					
						
						
						
						
							
						
						
							6fc7528809 
							
						 
					 
					
						
						
							
							create data volume is splitted into two stage:  
						
						 
						
						... 
						
						
						
						1. create a volume entry in the database,
2. when user attaching the volume to a VM, then actually create the volume on storage pool. 
						
						
					 
					
						2010-09-29 18:41:54 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								edison 
							
						 
					 
					
						
						
						
						
							
						
						
							ccf629360a 
							
						 
					 
					
						
						
							
							Sometimes, the permission of secondary-stoarage/templates is 755, no-writable.  
						
						 
						
						... 
						
						
						
						Fix it by "chmod 777 -R" for secondary storage 
						
						
					 
					
						2010-09-29 18:41:54 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								edison 
							
						 
					 
					
						
						
						
						
							
						
						
							964f8f1fe3 
							
						 
					 
					
						
						
							
							fix boot from iso  
						
						 
						
						
						
						
					 
					
						2010-09-29 18:41:54 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							478f41ec48 
							
						 
					 
					
						
						
							
							Do not delete OVA file after download to avoid repeated downloading  
						
						 
						
						
						
						
					 
					
						2010-09-29 18:41:53 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								edison 
							
						 
					 
					
						
						
						
						
							
						
						
							6906cb52f7 
							
						 
					 
					
						
						
							
							revert un neccessary changes  
						
						 
						
						
						
						
					 
					
						2010-09-29 18:40:52 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								edison 
							
						 
					 
					
						
						
						
						
							
						
						
							9e0f57bc0e 
							
						 
					 
					
						
						
							
							change code for new UI  
						
						 
						
						
						
						
					 
					
						2010-09-29 18:40:52 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								edison 
							
						 
					 
					
						
						
						
						
							
						
						
							8943cc6745 
							
						 
					 
					
						
						
							
							create volume  
						
						 
						
						... 
						
						
						
						Conflicts:
	api/src/com/cloud/vm/VmCharacteristics.java
	core/src/com/cloud/dc/ClusterVO.java
	core/src/com/cloud/server/ManagementServer.java
	server/src/com/cloud/network/NetworkManager.java
	server/src/com/cloud/storage/allocator/AbstractStoragePoolAllocator.java 
						
						
					 
					
						2010-09-29 18:40:51 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							86d59bdddd 
							
						 
					 
					
						
						
							
							Implement CreateVolume/AttachVolue for vmware  
						
						 
						
						
						
						
					 
					
						2010-09-29 18:40:51 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							72e8b767fe 
							
						 
					 
					
						
						
							
							Mount secondary storage as a datastore to implement ISO attachment  
						
						 
						
						
						
						
					 
					
						2010-09-29 18:40:50 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							f81491d5bd 
							
						 
					 
					
						
						
							
							Fixes to VmdkProcessor  
						
						 
						
						
						
						
					 
					
						2010-09-29 18:40:50 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							b262e0ec2c 
							
						 
					 
					
						
						
							
							add vmware template post-processing  
						
						 
						
						
						
						
					 
					
						2010-09-29 18:40:50 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							d33d1a632d 
							
						 
					 
					
						
						
							
							Switch from VMDK to OVA on vmware image format  
						
						 
						
						
						
						
					 
					
						2010-09-29 18:40:50 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							3f832c0c08 
							
						 
					 
					
						
						
							
							Test with OVF importing  
						
						 
						
						
						
						
					 
					
						2010-09-29 18:40:49 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							a3b8412b2d 
							
						 
					 
					
						
						
							
							test code to verify vmware FaultTolerance feature  
						
						 
						
						
						
						
					 
					
						2010-09-29 18:40:49 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								edison 
							
						 
					 
					
						
						
						
						
							
						
						
							3aef9f408e 
							
						 
					 
					
						
						
							
							step1  
						
						 
						
						
						
						
					 
					
						2010-09-29 18:40:47 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								edison 
							
						 
					 
					
						
						
						
						
							
						
						
							211b4c5da2 
							
						 
					 
					
						
						
							
							hybrid  
						
						 
						
						
						
						
					 
					
						2010-09-29 18:40:47 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							43bd6d1d2d 
							
						 
					 
					
						
						
							
							remove guestOS list  
						
						 
						
						
						
						
					 
					
						2010-09-29 17:23:38 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							bca96b1079 
							
						 
					 
					
						
						
							
							pass guest OS name instead of guest ID when start system VM  
						
						 
						
						
						
						
					 
					
						2010-09-29 17:18:27 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							be5fa82229 
							
						 
					 
					
						
						
							
							remove snapshotpolicyRef  
						
						 
						
						
						
						
					 
					
						2010-09-29 16:24:57 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							5b75f8e03b 
							
						 
					 
					
						
						
							
							bug 6365: find policy from volumeId instead of snapshotID  
						
						 
						
						... 
						
						
						
						status 6365: resolved fixed 
						
						
					 
					
						2010-09-29 15:25:46 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								abhishek 
							
						 
					 
					
						
						
						
						
							
						
						
							cd42fcc1bf 
							
						 
					 
					
						
						
							
							some code refactoring  
						
						 
						
						
						
						
					 
					
						2010-09-29 11:17:42 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							319d4f1aa0 
							
						 
					 
					
						
						
							
							snapshot redesign  
						
						 
						
						... 
						
						
						
						1. use full snapshot and delta snapshot, there are maxsnashot/2 of delta snapshot between two full snapshot
2. only support one policy for one volume
3. remove all coleases in secondary storage. 
						
						
					 
					
						2010-09-28 18:37:46 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								abhishek 
							
						 
					 
					
						
						
						
						
							
						
						
							72cb2ce4ca 
							
						 
					 
					
						
						
							
							test checkin  
						
						 
						
						
						
						
					 
					
						2010-09-28 18:11:36 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								abhishek 
							
						 
					 
					
						
						
						
						
							
						
						
							e5186bde2b 
							
						 
					 
					
						
						
							
							bug 5190: a part of the enhancement is complete; now we can upload a custom cert using a file from our local machine, into the system. It is stored in the certificate table as a "text" column  
						
						 
						
						
						
						
					 
					
						2010-09-28 13:52:14 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								abhishek 
							
						 
					 
					
						
						
						
						
							
						
						
							300905df84 
							
						 
					 
					
						
						
							
							adding some more files  
						
						 
						
						
						
						
					 
					
						2010-09-28 11:07:04 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								abhishek 
							
						 
					 
					
						
						
						
						
							
						
						
							918ddff25e 
							
						 
					 
					
						
						
							
							some code cleanup, and adding some more meat to the enh  
						
						 
						
						
						
						
					 
					
						2010-09-28 11:03:12 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							9b10074c2a 
							
						 
					 
					
						
						
							
							Added missing license info to the bunch of files  
						
						 
						
						
						
						
					 
					
						2010-09-27 19:08:03 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Chiradeep Vittal 
							
						 
					 
					
						
						
						
						
							
						
						
							f1b0e4b811 
							
						 
					 
					
						
						
							
							tweaks for debian system vm  
						
						 
						
						
						
						
					 
					
						2010-09-27 18:04:49 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								abhishek 
							
						 
					 
					
						
						
						
						
							
						
						
							89cce1a023 
							
						 
					 
					
						
						
							
							bug 5190: adding some more methods for the functionality  
						
						 
						
						
						
						
					 
					
						2010-09-27 16:54:28 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							dcea43ba0f 
							
						 
					 
					
						
						
							
							create is now complete  
						
						 
						
						
						
						
					 
					
						2010-09-27 15:14:38 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							c443867f28 
							
						 
					 
					
						
						
							
							more changes  
						
						 
						
						
						
						
					 
					
						2010-09-27 15:14:38 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								abhishek 
							
						 
					 
					
						
						
						
						
							
						
						
							6f9e327d0b 
							
						 
					 
					
						
						
							
							bug 5191: final check in for the enhancement to make the console proxy domain configurable  
						
						 
						
						... 
						
						
						
						status 5191: resolved fixed 
						
						
					 
					
						2010-09-27 11:27:48 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								abhishek 
							
						 
					 
					
						
						
						
						
							
						
						
							72243c8382 
							
						 
					 
					
						
						
							
							bug 5191: incremental checkin  
						
						 
						
						
						
						
					 
					
						2010-09-27 11:10:55 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								nit 
							
						 
					 
					
						
						
						
						
							
						
						
							b857a9b4c8 
							
						 
					 
					
						
						
							
							bug 4177:  registerTemplate/registerIso commands would start accepting account/domainId params.  
						
						 
						
						... 
						
						
						
						status 4177: resolved fixed 
						
						
					 
					
						2010-09-27 17:24:23 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								kishan 
							
						 
					 
					
						
						
						
						
							
						
						
							ec4755a60e 
							
						 
					 
					
						
						
							
							bug 6123: Include last id in the vlan range  
						
						 
						
						... 
						
						
						
						status 6123: resolved fixed 
						
						
					 
					
						2010-09-27 16:57:31 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								kishan 
							
						 
					 
					
						
						
						
						
							
						
						
							6e4fa7fcd1 
							
						 
					 
					
						
						
							
							bug 6176: Included domR name in networkUsage command  
						
						 
						
						... 
						
						
						
						status 6176: resolved fixed 
						
						
					 
					
						2010-09-27 16:26:56 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								abhishek 
							
						 
					 
					
						
						
						
						
							
						
						
							7dc62cc293 
							
						 
					 
					
						
						
							
							bug 6247: incremental checkin  
						
						 
						
						
						
						
					 
					
						2010-09-24 14:33:13 -07:00