nit 
							
						 
					 
					
						
						
						
						
							
						
						
							33e683e2c7 
							
						 
					 
					
						
						
							
							bug 4286: Making ExtractVolumeCommand async and some code cleanup  
						
						 
						
						
						
						
					 
					
						2010-09-19 18:34:12 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								abhishek 
							
						 
					 
					
						
						
						
						
							
						
						
							a016aa27cd 
							
						 
					 
					
						
						
							
							bug 6203: incremental fix  
						
						 
						
						
						
						
					 
					
						2010-09-17 16:59:40 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							bebe79ebc9 
							
						 
					 
					
						
						
							
							more work from alex  
						
						 
						
						
						
						
					 
					
						2010-09-17 13:37:53 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								nit 
							
						 
					 
					
						
						
						
						
							
						
						
							7c6ad35ed7 
							
						 
					 
					
						
						
							
							reinstating the accidental deletion of some lines  
						
						 
						
						
						
						
					 
					
						2010-09-17 17:26:24 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								nit 
							
						 
					 
					
						
						
						
						
							
						
						
							48cd102ab9 
							
						 
					 
					
						
						
							
							Merge branch 'master' of ssh://git.cloud.com/var/lib/git/cloudstack-oss  
						
						 
						
						
						
						
					 
					
						2010-09-17 17:04:35 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								nit 
							
						 
					 
					
						
						
						
						
							
						
						
							636dc041c7 
							
						 
					 
					
						
						
							
							bug 4286: Making extractIsoCmd and extractTemplateCmd async  
						
						 
						
						
						
						
					 
					
						2010-09-17 17:04:07 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							221c8fb059 
							
						 
					 
					
						
						
							
							add more log  
						
						 
						
						
						
						
					 
					
						2010-09-16 19:32:25 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							921fba1ea1 
							
						 
					 
					
						
						
							
							bug 6190: set qos of vif  
						
						 
						
						... 
						
						
						
						status 6190: resolved fixed 
						
						
					 
					
						2010-09-16 12:32:46 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							131e487c32 
							
						 
					 
					
						
						
							
							allocation complete.  Moving on to actual create and deploy  
						
						 
						
						
						
						
					 
					
						2010-09-16 12:01:56 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							7ca2adeb67 
							
						 
					 
					
						
						
							
							first host doesn't need to switch master  
						
						 
						
						
						
						
					 
					
						2010-09-15 21:24:52 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								abhishek 
							
						 
					 
					
						
						
						
						
							
						
						
							7abfb9f2e4 
							
						 
					 
					
						
						
							
							some minor improvements to the stats module  
						
						 
						
						
						
						
					 
					
						2010-09-15 18:12:40 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							e283bc7f05 
							
						 
					 
					
						
						
							
							no idea how these files were not committed  
						
						 
						
						
						
						
					 
					
						2010-09-15 18:00:55 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							327924a9ad 
							
						 
					 
					
						
						
							
							More changes for refactoring  
						
						 
						
						
						
						
					 
					
						2010-09-15 18:00:54 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								abhishek 
							
						 
					 
					
						
						
						
						
							
						
						
							652620363d 
							
						 
					 
					
						
						
							
							bug 3120: reverting changes as still soliciting feedback on design  
						
						 
						
						
						
						
					 
					
						2010-09-15 11:52:31 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								abhishek 
							
						 
					 
					
						
						
						
						
							
						
						
							a05dc480a7 
							
						 
					 
					
						
						
							
							bug 3120: incremental checkin  
						
						 
						
						
						
						
					 
					
						2010-09-15 11:18:04 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								nit 
							
						 
					 
					
						
						
						
						
							
						
						
							ab1a6b8656 
							
						 
					 
					
						
						
							
							bug 4286: Adding the extractVolune function  
						
						 
						
						
						
						
					 
					
						2010-09-15 18:33:42 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								nit 
							
						 
					 
					
						
						
						
						
							
						
						
							f5ac46255c 
							
						 
					 
					
						
						
							
							bug 4286: Schema changes to include the upload table, Introducing extractIso command and extractVolume command  
						
						 
						
						
						
						
					 
					
						2010-09-15 17:51:42 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							012f097885 
							
						 
					 
					
						
						
							
							Merge branch 'master' of ssh://git.cloud.com/var/lib/git/cloudstack-oss  
						
						 
						
						... 
						
						
						
						Conflicts:
	core/src/com/cloud/server/ManagementServer.java
	server/src/com/cloud/server/ManagementServerImpl.java
	server/src/com/cloud/vm/UserVmManagerImpl.java 
						
						
					 
					
						2010-09-14 19:57:26 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							05499fa5f6 
							
						 
					 
					
						
						
							
							execute only emergency command with slaveconn. othersiwe api call hands  
						
						 
						
						
						
						
					 
					
						2010-09-14 19:22:24 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							b26ac321de 
							
						 
					 
					
						
						
							
							bug 6177: Make VM group a first class object  
						
						 
						
						... 
						
						
						
						1) Added new apis: createInstanceGroup, updateInstanceGroup, deleteInstanceGroup, listInstanceGroups
2) Group can be created using:
* createInsanceGroup api
* deployVirtualMachine/updateVirtualMachine commands (we create a group with name equal to "group" parameter value if the group doesn't exist already)
3) Group can be removed by:
* deleteInstanceGroup api
* when corresponding account is removed
4) Vm can be assigned to one group only. To move vm from one group to another, use updateVirtualMachine command with "group" parameter
5) Changed listVirtualMachines command to use "groupId" parameter instead of "group".
status 6177: resolved fixed 
						
						
					 
					
						2010-09-14 19:08:01 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								abhishek 
							
						 
					 
					
						
						
						
						
							
						
						
							ab166071f8 
							
						 
					 
					
						
						
							
							bug 6163: refactoring some more code  
						
						 
						
						
						
						
					 
					
						2010-09-14 10:05:05 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								abhishek 
							
						 
					 
					
						
						
						
						
							
						
						
							743187a951 
							
						 
					 
					
						
						
							
							bug 6163: implementing the search function for zone wide searches for vlans  
						
						 
						
						
						
						
					 
					
						2010-09-14 10:05:05 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								abhishek 
							
						 
					 
					
						
						
						
						
							
						
						
							10ad2aa468 
							
						 
					 
					
						
						
							
							bug 6163: further addition of functionality wrt zone wide vlan search  
						
						 
						
						
						
						
					 
					
						2010-09-14 10:05:05 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								abhishek 
							
						 
					 
					
						
						
						
						
							
						
						
							ce7278164d 
							
						 
					 
					
						
						
							
							bug 6163: adding new dao functionality  
						
						 
						
						
						
						
					 
					
						2010-09-14 10:05:05 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								abhishek 
							
						 
					 
					
						
						
						
						
							
						
						
							a03cf45e5d 
							
						 
					 
					
						
						
							
							further improvements to the sp code, especially for the local storage case  
						
						 
						
						
						
						
					 
					
						2010-09-13 12:00:54 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								edison 
							
						 
					 
					
						
						
						
						
							
						
						
							d933f19d35 
							
						 
					 
					
						
						
							
							bug 5800: add cluster for KVM  
						
						 
						
						... 
						
						
						
						TODO: need to make sure the host cpu is from the same vender in a cluster 
						
						
					 
					
						2010-09-10 16:00:36 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							55ebf465f6 
							
						 
					 
					
						
						
							
							Merge branch 'master' of ssh://anthony@git.cloud.com/var/lib/git/cloudstack-oss  
						
						 
						
						
						
						
					 
					
						2010-09-10 15:14:19 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								abhishek 
							
						 
					 
					
						
						
						
						
							
						
						
							4682b25cb5 
							
						 
					 
					
						
						
							
							bug 5147: implemented the logic to ensure that the volume creation is blocked when all sp's are in maintenance (or any of the status != UP)  
						
						 
						
						
						
						
					 
					
						2010-09-10 14:41:04 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								abhishek 
							
						 
					 
					
						
						
						
						
							
						
						
							93261c4eb8 
							
						 
					 
					
						
						
							
							bug 5147: Improvements after testing the storage maintenance across multiple sp's, with sys vms scattered across multiple sps  
						
						 
						
						
						
						
					 
					
						2010-09-10 13:44:39 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							f9bb54d7e2 
							
						 
					 
					
						
						
							
							use -1 instead of null  
						
						 
						
						
						
						
					 
					
						2010-09-10 13:03:08 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								abhishek 
							
						 
					 
					
						
						
						
						
							
						
						
							20973d48af 
							
						 
					 
					
						
						
							
							bug 5147: implementing the recommendations i got for the ps maintenance. For now, we are not implementing the cancel maintenance part. Instead, we are going to ask the admin if he is "sure" of enabling maintenance on a sp, before proceeding  
						
						 
						
						
						
						
					 
					
						2010-09-09 18:05:43 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								root 
							
						 
					 
					
						
						
						
						
							
						
						
							76e5cf3321 
							
						 
					 
					
						
						
							
							renamed dao methods to correctly reflect what they do  
						
						 
						
						
						
						
					 
					
						2010-09-09 18:01:50 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							d4828debba 
							
						 
					 
					
						
						
							
							fix about prepareMigrationCommand  
						
						 
						
						
						
						
					 
					
						2010-09-09 15:43:33 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							bcaaef5f60 
							
						 
					 
					
						
						
							
							bug 6110: return precise message if VLAN is already created on another device. public and direct should use different VLAN.  
						
						 
						
						
						
						
					 
					
						2010-09-09 13:42:24 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							7249f168d5 
							
						 
					 
					
						
						
							
							more file changes  
						
						 
						
						
						
						
					 
					
						2010-09-09 13:27:20 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							6134f7dfd2 
							
						 
					 
					
						
						
							
							more file changes  
						
						 
						
						
						
						
					 
					
						2010-09-09 11:52:12 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								abhishek 
							
						 
					 
					
						
						
						
						
							
						
						
							854611e40a 
							
						 
					 
					
						
						
							
							bug 5897: returning the os_type_id  
						
						 
						
						... 
						
						
						
						status 5897: resolved fixed 
						
						
					 
					
						2010-08-30 16:25:58 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							5d8cadb7b0 
							
						 
					 
					
						
						
							
							correctly use session in plugin  
						
						 
						
						
						
						
					 
					
						2010-08-29 23:59:33 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							93b56fec8c 
							
						 
					 
					
						
						
							
							Use Session to login out  
						
						 
						
						
						
						
					 
					
						2010-08-29 21:28:31 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							cad615e8e4 
							
						 
					 
					
						
						
							
							support multiple patch files  
						
						 
						
						
						
						
					 
					
						2010-08-29 19:21:03 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							e270011aed 
							
						 
					 
					
						
						
							
							add wrapper for vdi.copy  
						
						 
						
						
						
						
					 
					
						2010-08-29 18:01:25 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							4b3777e656 
							
						 
					 
					
						
						
							
							clean up disableVlanNetwork  
						
						 
						
						
						
						
					 
					
						2010-08-29 15:43:18 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								anthony 
							
						 
					 
					
						
						
						
						
							
						
						
							55f3a65ec0 
							
						 
					 
					
						
						
							
							change plugin timeout to 1800s  
						
						 
						
						
						
						
					 
					
						2010-08-28 21:17:32 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							753fe25074 
							
						 
					 
					
						
						
							
							Link with create/start command for vmware VMs  
						
						 
						
						
						
						
					 
					
						2010-08-27 16:32:06 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								kishan 
							
						 
					 
					
						
						
						
						
							
						
						
							0e326e853c 
							
						 
					 
					
						
						
							
							bug 5900: Added events for disk offering  
						
						 
						
						
						
						
					 
					
						2010-08-27 18:02:23 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Anthony Xu 
							
						 
					 
					
						
						
						
						
							
						
						
							8a928a7a30 
							
						 
					 
					
						
						
							
							Merge branch 'master' of ssh://anthony@git.cloud.com/var/lib/git/cloudstack-oss  
						
						 
						
						
						
						
					 
					
						2010-08-26 16:06:57 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Anthony Xu 
							
						 
					 
					
						
						
						
						
							
						
						
							d72e0538da 
							
						 
					 
					
						
						
							
							Revert "Revert "use iso to patch systemvm""  
						
						 
						
						... 
						
						
						
						This reverts commit 145e2e0aaa9b57286102664787e8e40ad3d75e26. 
						
						
					 
					
						2010-08-26 16:06:28 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Anthony Xu 
							
						 
					 
					
						
						
						
						
							
						
						
							145e2e0aaa 
							
						 
					 
					
						
						
							
							Revert "use iso to patch systemvm"  
						
						 
						
						... 
						
						
						
						This reverts commit 3565f8d21b331745b99ce3a09a35d642f2f7bcfe. 
						
						
					 
					
						2010-08-26 16:03:34 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								root 
							
						 
					 
					
						
						
						
						
							
						
						
							3565f8d21b 
							
						 
					 
					
						
						
							
							use iso to patch systemvm  
						
						 
						
						... 
						
						
						
						Conflicts:
	core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
	scripts/vm/hypervisor/xenserver/xenserver56/patch 
						
						
					 
					
						2010-08-26 15:56:02 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							b69816814c 
							
						 
					 
					
						
						
							
							Merge branch 'master' of ssh://git.cloud.com/var/lib/git/cloudstack-oss  
						
						 
						
						
						
						
					 
					
						2010-08-26 13:56:23 -07:00