edison 
							
						 
					 
					
						
						
						
						
							
						
						
							0c35f2f743 
							
						 
					 
					
						
						
							
							bug 7237: disk size is passed in diskProfile, no need size parameter in createcommand  
						
						 
						
						... 
						
						
						
						status 7237: rresolved fixed 
						
						
					 
					
						2010-11-19 11:55:27 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							dae39942f1 
							
						 
					 
					
						
						
							
							bug 7192: Added networktype parameter for the zone  
						
						 
						
						... 
						
						
						
						status 7192: resolved fixed
1) Zone has networktype parameter now, 2 values are supported: Basic and Advanced. "networktype" field is created in data_center table. The parameter is being set at creation time; we don't allow to modify it with updateZone command.
2) Only vlan of Untagged Direct type can be created in Basic network zone; any other vlan except for Untagged Direct can be created in Advanced zone
3) Allow NULL guest vlan range for the zone. Only vlan of Direct type can be created in zone with NULL guest vlan.
4) "Default" zone is Basic by default.
5) Changed "vnet" parameter to "vlan" in updateZone command to be consistent with createZone 
						
						
					 
					
						2010-11-16 16:54:44 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							17afeade00 
							
						 
					 
					
						
						
							
							better componentslocator  
						
						 
						
						
						
						
					 
					
						2010-11-16 04:28:14 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								abhishek 
							
						 
					 
					
						
						
						
						
							
						
						
							6d943abf55 
							
						 
					 
					
						
						
							
							bug 7119: code refactor away from the ms calls, to the share and prepare methods based on alex's recommendations  
						
						 
						
						... 
						
						
						
						status 7119: resolved fixed 
						
						
					 
					
						2010-11-15 11:17:36 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								edison 
							
						 
					 
					
						
						
						
						
							
						
						
							8ca6f1669e 
							
						 
					 
					
						
						
							
							start2command fro secondarys storage vm and make it work for KVM  
						
						 
						
						
						
						
					 
					
						2010-11-11 17:04:10 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							94250c1330 
							
						 
					 
					
						
						
							
							committing to update  
						
						 
						
						
						
						
					 
					
						2010-11-11 12:53:19 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							86e83bc4bd 
							
						 
					 
					
						
						
							
							Created new response objects for userVm/domainRouter/systemVm that going to be used by API after network refactorig is in place.  
						
						 
						
						
						
						
					 
					
						2010-11-11 10:43:18 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								abhishek 
							
						 
					 
					
						
						
						
						
							
						
						
							11ea13fd7d 
							
						 
					 
					
						
						
							
							Added the domain checker code and checks for a host of commands. This replaces the previous mechanism, and provides a way for us to validate the command executor as to whether he has access to the zone.  
						
						 
						
						
						
						
					 
					
						2010-11-08 17:50:38 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							edf9ddd464 
							
						 
					 
					
						
						
							
							added reservation id to vnet  
						
						 
						
						
						
						
					 
					
						2010-11-08 12:29:38 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							aca8ef79cd 
							
						 
					 
					
						
						
							
							a bunch of other changes for network refactoring  
						
						 
						
						
						
						
					 
					
						2010-11-08 12:29:37 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							5f90a8adb0 
							
						 
					 
					
						
						
							
							Checking in to do git pull...stupid git  
						
						 
						
						
						
						
					 
					
						2010-11-05 16:10:22 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							1fe446002b 
							
						 
					 
					
						
						
							
							stop vm is now formalized  
						
						 
						
						
						
						
					 
					
						2010-11-05 16:10:22 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							d5d1808488 
							
						 
					 
					
						
						
							
							Added reservation context to the network gurus  
						
						 
						
						
						
						
					 
					
						2010-11-05 16:10:22 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								edison 
							
						 
					 
					
						
						
						
						
							
						
						
							433c28fb16 
							
						 
					 
					
						
						
							
							bug 7041: fix npe in delete template from storage pool, if the template already marked as removed  
						
						 
						
						... 
						
						
						
						status 7041: resolved fixed 
						
						
					 
					
						2010-11-05 16:02:18 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							0fdca8be9a 
							
						 
					 
					
						
						
							
							changed back so everyone else can start the old way  
						
						 
						
						
						
						
					 
					
						2010-11-03 21:18:31 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							a0cb58aad2 
							
						 
					 
					
						
						
							
							Harmony amongst gurus  
						
						 
						
						
						
						
					 
					
						2010-11-03 21:18:31 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							e27bb550fe 
							
						 
					 
					
						
						
							
							Harmony among gurus  
						
						 
						
						
						
						
					 
					
						2010-11-03 21:18:31 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							3348b56ab7 
							
						 
					 
					
						
						
							
							Successful creation of domr and uservm with all programming done correctly.....yahooo  
						
						 
						
						
						
						
					 
					
						2010-11-02 12:25:08 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							6311644e08 
							
						 
					 
					
						
						
							
							Successful creation of domr and uservm with all programming done correctly.....yahooo  
						
						 
						
						
						
						
					 
					
						2010-11-02 12:25:08 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							14f80f2e13 
							
						 
					 
					
						
						
							
							domain router up and running...now on to patching through the network between the domain router and the vm  
						
						 
						
						
						
						
					 
					
						2010-10-29 12:16:58 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							4f9f249218 
							
						 
					 
					
						
						
							
							make console proxy work again with the new network configuration  
						
						 
						
						
						
						
					 
					
						2010-10-26 17:37:29 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							1a641936da 
							
						 
					 
					
						
						
							
							no more alert on setup  
						
						 
						
						
						
						
					 
					
						2010-10-26 09:35:24 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							2bc938c3f8 
							
						 
					 
					
						
						
							
							checkins for problems.  
						
						 
						
						
						
						
					 
					
						2010-10-26 09:35:24 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							29a5b796d4 
							
						 
					 
					
						
						
							
							deploy vm completed...now for testing  
						
						 
						
						
						
						
					 
					
						2010-10-26 09:35:24 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							f58063911e 
							
						 
					 
					
						
						
							
							deploy vm completed  
						
						 
						
						
						
						
					 
					
						2010-10-26 09:35:24 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							25e4ed6997 
							
						 
					 
					
						
						
							
							more changes in the api  
						
						 
						
						
						
						
					 
					
						2010-10-21 16:53:42 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							d5d8f27cad 
							
						 
					 
					
						
						
							
							Added more changes to the api  
						
						 
						
						
						
						
					 
					
						2010-10-21 15:11:49 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								kishan 
							
						 
					 
					
						
						
						
						
							
						
						
							fa4a16cb68 
							
						 
					 
					
						
						
							
							bug 5592: Added configurable domain for hosts.  
						
						 
						
						... 
						
						
						
						status 5592: resolved fixed 
						
						
					 
					
						2010-10-21 11:51:09 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							2da8035bd1 
							
						 
					 
					
						
						
							
							more changes for the rewrite  
						
						 
						
						
						
						
					 
					
						2010-10-19 11:52:02 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							794ca16a65 
							
						 
					 
					
						
						
							
							Added code to start domR  
						
						 
						
						
						
						
					 
					
						2010-10-19 11:52:01 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							b3da4cea1b 
							
						 
					 
					
						
						
							
							Forcing me to commit because of stupid git  
						
						 
						
						
						
						
					 
					
						2010-10-15 06:22:59 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kris McQueen 
							
						 
					 
					
						
						
						
						
							
						
						
							8e086d7a21 
							
						 
					 
					
						
						
							
							resolving merge conflicts between 2.1.refactor and master  
						
						 
						
						
						
						
					 
					
						2010-10-12 16:28:16 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kris McQueen 
							
						 
					 
					
						
						
						
						
							
						
						
							2740ba6c40 
							
						 
					 
					
						
						
							
							final merge of master->2.1.refactor preparing for merge back into master  
						
						 
						
						
						
						
					 
					
						2010-10-12 14:46:24 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							ce091de3d2 
							
						 
					 
					
						
						
							
							more changes for refactor  
						
						 
						
						
						
						
					 
					
						2010-10-12 07:17:47 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							94a26d2038 
							
						 
					 
					
						
						
							
							Still needs to add mac address allocation but basically console proxy is started and running  
						
						 
						
						
						
						
					 
					
						2010-10-06 10:18:09 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							5f88268ef2 
							
						 
					 
					
						
						
							
							console proxy vm is now started but it is not reading the disk correctly  
						
						 
						
						
						
						
					 
					
						2010-10-04 17:59:06 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							652d86956c 
							
						 
					 
					
						
						
							
							more files checked in  
						
						 
						
						
						
						
					 
					
						2010-10-04 12:04:59 -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 
							
						 
					 
					
						
						
						
						
							
						
						
							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 
							
						 
					 
					
						
						
						
						
							
						
						
							d33d1a632d 
							
						 
					 
					
						
						
							
							Switch from VMDK to OVA on vmware image format  
						
						 
						
						
						
						
					 
					
						2010-09-29 18:40:50 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							5b2740f3f9 
							
						 
					 
					
						
						
							
							Change VMware template extenstion to ova  
						
						 
						
						
						
						
					 
					
						2010-09-29 18:40:50 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								edison 
							
						 
					 
					
						
						
						
						
							
						
						
							edb16aa117 
							
						 
					 
					
						
						
							
							change storage allocator policy based on hypervisor  
						
						 
						
						
						
						
					 
					
						2010-09-29 18:40:47 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kris McQueen 
							
						 
					 
					
						
						
						
						
							
						
						
							848ce60097 
							
						 
					 
					
						
						
							
							Merging master into 2.1.refactor, resolve the merge conflicts as best I can.  New commands related to extracting template/iso/volume and related to instance groups were refactored to the new API framework.  
						
						 
						
						
						
						
					 
					
						2010-09-28 15:47:14 -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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								root 
							
						 
					 
					
						
						
						
						
							
						
						
							979fcf8b78 
							
						 
					 
					
						
						
							
							finalized guru design  
						
						 
						
						
						
						
					 
					
						2010-09-22 10:44:00 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							c0d8422d69 
							
						 
					 
					
						
						
							
							more changes  
						
						 
						
						
						
						
					 
					
						2010-09-22 10:43:59 -07:00