Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							8f556e6d88 
							
						 
					 
					
						
						
							
							Made changes to configuration.  Eliminated ConfigValue and only use ConfigKey  
						
						 
						
						
						
						
					 
					
						2013-09-06 15:40:38 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							6e8ca99466 
							
						 
					 
					
						
						
							
							Got all of the config stuff out of the way  
						
						 
						
						
						
						
					 
					
						2013-09-06 15:40:36 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							435e74e914 
							
						 
					 
					
						
						
							
							Commit to try something on removing getZone  
						
						 
						
						
						
						
					 
					
						2013-09-06 15:40:33 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							2e5bb63f77 
							
						 
					 
					
						
						
							
							Moved NetworkManagerImpl to NetworkOrchestrator  
						
						 
						
						
						
						
					 
					
						2013-09-06 15:40:32 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							8e5249df62 
							
						 
					 
					
						
						
							
							Moved NetworkManager to NetworkOrchestrationService  
						
						 
						
						
						
						
					 
					
						2013-09-06 15:40:31 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							e92d46bfd4 
							
						 
					 
					
						
						
							
							CLOUDSTACK-4600:Registered Cross-zone template does not populate  
						
						 
						
						... 
						
						
						
						template_zone_ref for later added zones. 
						
						
					 
					
						2013-09-03 16:39:23 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Chip Childers 
							
						 
					 
					
						
						
						
						
							
						
						
							bf967eb622 
							
						 
					 
					
						
						
							
							Updating datetime format of events to include the timezone  
						
						 
						
						
						
						
					 
					
						2013-09-03 12:45:01 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Chip Childers 
							
						 
					 
					
						
						
						
						
							
						
						
							14ee684ce3 
							
						 
					 
					
						
						
							
							Adding eventDateTime to all event generation locations  
						
						 
						
						
						
						
					 
					
						2013-09-03 11:34:56 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							8113ebb08f 
							
						 
					 
					
						
						
							
							Moved the csvtotags into StringUtils.  It was there to begin with.  No idea who copied it to ConfigurationManager  
						
						 
						
						
						
						
					 
					
						2013-08-26 20:27:27 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							96a17cc036 
							
						 
					 
					
						
						
							
							CLOUDSTACK-4428: "kvm.snapshot.enabled" flag shouldn't affect detached volumes, or volumes attached to the vm in Stopped/Destroyed state  
						
						 
						
						
						
						
					 
					
						2013-08-21 16:27:16 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							494ea5052f 
							
						 
					 
					
						
						
							
							Made IpAddressManager a manager  
						
						 
						
						
						
						
					 
					
						2013-08-19 14:13:31 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							4ba359c3fe 
							
						 
					 
					
						
						
							
							Moved VirtualMachineManager into engine  
						
						 
						
						
						
						
					 
					
						2013-08-19 14:13:28 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							c675f826e5 
							
						 
					 
					
						
						
							
							CLOUDSTACK-4318:[Object_Store_Refactor] Failed to delete snapshot copied  
						
						 
						
						... 
						
						
						
						to Staging storage during snapshot creation. 
						
						
					 
					
						2013-08-14 18:12:53 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Mike Tutkowski 
							
						 
					 
					
						
						
						
						
							
						
						
							0f60b5d41c 
							
						 
					 
					
						
						
							
							CLOUDSTACK-4331 - Enable more capacity from a managed storage device to be given to CloudStack  
						
						 
						
						
						
						
					 
					
						2013-08-14 15:02:57 -06:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							f87eed5b79 
							
						 
					 
					
						
						
							
							fix compile  
						
						 
						
						
						
						
					 
					
						2013-08-13 15:16:46 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							3eb34d082d 
							
						 
					 
					
						
						
							
							CLOUDSTACK-4298: in case both xenserver/vmware mixed in one zone, need to make sure, ssvm is loaded with premiumsecondaryresource  
						
						 
						
						
						
						
					 
					
						2013-08-13 15:16:46 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							3df5571d2e 
							
						 
					 
					
						
						
							
							Resolved merge conflicts  
						
						 
						
						
						
						
					 
					
						2013-08-12 20:15:24 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							de2bd96d98 
							
						 
					 
					
						
						
							
							Moved volume related code into cloud-engine-orchestration  
						
						 
						
						
						
						
					 
					
						2013-08-12 19:06:51 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							ae8ed58228 
							
						 
					 
					
						
						
							
							Added missing file  
						
						 
						
						
						
						
					 
					
						2013-08-12 19:05:23 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							0e19e82fac 
							
						 
					 
					
						
						
							
							Split up the volume manager into two.  One part is for self-service.  One part belongs in the engine.  Removed old 2.1 upgrade code.  In order to upgrade from 2.1, you must upgrade to 2.2. first.  So therefore these files are no necessary in the newer versions of CloudStack  
						
						 
						
						
						
						
					 
					
						2013-08-12 19:05:22 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Likitha Shetty 
							
						 
					 
					
						
						
						
						
							
						
						
							cd2ea3b844 
							
						 
					 
					
						
						
							
							CLOUDSTACK-4244. Unable to attach a volume to a VM deployed in Stopped (startvm=false) state.  
						
						 
						
						... 
						
						
						
						While attaching a volume to a VM, create volume on the hypervisor only if the VM has been started on the it. 
						
						
					 
					
						2013-08-12 15:49:08 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Rajesh Battala 
							
						 
					 
					
						
						
						
						
							
						
						
							be9dbcc2c5 
							
						 
					 
					
						
						
							
							CLOUDSTACK-3946 [KVM] [Zone Wide Primary Storages] migrateVolume is deleting the volume if the source and destination pool are same  
						
						 
						
						
						
						
					 
					
						2013-08-12 13:41:49 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Harikrishna Patnala 
							
						 
					 
					
						
						
						
						
							
						
						
							2868d4b336 
							
						 
					 
					
						
						
							
							CLOUDSTACK-3228: system vms are not comming up in zone with two cluster xen and kvm; Zone host is ready, but secondary storage vm template: 3 is not ready on secondary storage: 2  
						
						 
						
						... 
						
						
						
						Signed-off-by: Abhinandan Prateek <aprateek@apache.org> 
						
						
					 
					
						2013-08-11 20:34:39 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Mike Tutkowski 
							
						 
					 
					
						
						
						
						
							
						
						
							d39408cd0c 
							
						 
					 
					
						
						
							
							CLOUDSTACK-4227  
						
						 
						
						
						
						
					 
					
						2013-08-10 17:43:15 -06:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Harikrishna Patnala 
							
						 
					 
					
						
						
						
						
							
						
						
							5404bf6063 
							
						 
					 
					
						
						
							
							CLOUDSTACK-4123: 3.0.6 to ASF 4.2 Upgrade: On Adding VMWare Cluster to the Setup, 3.0.6 System VM Template for VMWare is downloaded instead of 4.2  
						
						 
						
						... 
						
						
						
						Updating the new system template URLs for the existing templates during upgrade to 4.2.
If new 4.2 system template is registered before upgrade then marking the old templates as removed during upgrade. 
						
						
					 
					
						2013-08-10 18:02:49 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Likitha Shetty 
							
						 
					 
					
						
						
						
						
							
						
						
							ec669ff48e 
							
						 
					 
					
						
						
							
							CLOUDSTACK-3786. Snapshots removed field is not set after successful deletion of the snapshot.  
						
						 
						
						... 
						
						
						
						Set the removed field for snapshot when the storage gc removes the snapshot 
						
						
					 
					
						2013-08-09 18:48:29 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Devdeep Singh 
							
						 
					 
					
						
						
						
						
							
						
						
							32701f027a 
							
						 
					 
					
						
						
							
							CLOUDSTACK-2670. Migrate volume doesn't allow migration of volumes of a stopped vm.  
						
						 
						
						... 
						
						
						
						The findStoragePoolsForMigration and migrateVolume api were explicitly blocking moving
a volume if the instance to which it was attached was stopped. Updated the check for
the same. 
						
						
					 
					
						2013-08-09 14:28:01 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							99c3e4f3f5 
							
						 
					 
					
						
						
							
							CLOUDSTACK-4190: Add endpoint selector implementation for ImageCache  
						
						 
						
						... 
						
						
						
						data store and also delete object from staging area for volume copy from
primary to secondary or vice versa. 
						
						
					 
					
						2013-08-08 16:17:00 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							5495f10bce 
							
						 
					 
					
						
						
							
							Revert "Reverting the range of commits that broke the build"  
						
						 
						
						... 
						
						
						
						This reverts commit b59e3aaefced03d40d5b4b63c421c69743bcd387. 
						
						
					 
					
						2013-08-08 15:02:40 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							958c2b2040 
							
						 
					 
					
						
						
							
							CLOUDSTACK-4141: resizeVolume - read the result of AsyncCallFuture execution. If false, return null to the API caller  
						
						 
						
						
						
						
					 
					
						2013-08-08 13:53:58 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Prasanna Santhanam 
							
						 
					 
					
						
						
						
						
							
						
						
							b59e3aaefc 
							
						 
					 
					
						
						
							
							Reverting the range of commits that broke the build  
						
						 
						
						... 
						
						
						
						This reverts commits 30c33415..f6a2c817bc
Signed-off-by: Prasanna Santhanam <tsp@apache.org> 
						
						
					 
					
						2013-08-08 14:46:56 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							942f282a6e 
							
						 
					 
					
						
						
							
							Moved config into it's own package  
						
						 
						
						
						
						
					 
					
						2013-08-07 16:41:02 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Wido den Hollander 
							
						 
					 
					
						
						
						
						
							
						
						
							fd793f7fb6 
							
						 
					 
					
						
						
							
							config: Fix a typo in the configuration option  
						
						 
						
						
						
						
					 
					
						2013-08-06 15:19:43 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Likitha Shetty 
							
						 
					 
					
						
						
						
						
							
						
						
							eac3631abe 
							
						 
					 
					
						
						
							
							CLOUDSTACK-4038. State of the DATA volumes remains in Allocated state if they are deleted before using them.  
						
						 
						
						... 
						
						
						
						If a volume is in Allocated state i.e. not present in primary or secondary mark the volume as removed. 
						
						
					 
					
						2013-08-06 16:02:40 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Prasanna Santhanam 
							
						 
					 
					
						
						
						
						
							
						
						
							0eafc0c0d8 
							
						 
					 
					
						
						
							
							CLOUDSTACK-4064: Missed renaming the config for KVM snapshots  
						
						 
						
						... 
						
						
						
						KVM.snapshot.enabled is lowercased by f025db95 to keep the configs
uniformly lower-case. But it missed the upgrade script and the
references in SnapshotManagerImpl. This commit will fix the issue in all
locations
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
(cherry picked from commit 0e216fa7e41bdfe0cc744006bb896c8b00138ca2) 
						
						
					 
					
						2013-08-06 10:39:14 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Harikrishna Patnala 
							
						 
					 
					
						
						
						
						
							
						
						
							506f2a4b94 
							
						 
					 
					
						
						
							
							CLOUDSTACK-3228: system vms are not comming up in zone with two cluster xen and kvm CLOUDSTACK-3631: Enhance System vm deployment retry mechanism  
						
						 
						
						... 
						
						
						
						Signed off by : Nitin Mehta<nitin.mehta@citrix.com> 
						
						
					 
					
						2013-08-05 18:19:16 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							151a7ee497 
							
						 
					 
					
						
						
							
							CLOUDSTACK-3861 and CLOUDSTACK-3862: Deprecate old S3/Swift classes.  
						
						 
						
						
						
						
					 
					
						2013-08-02 18:16:46 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							8930cfa983 
							
						 
					 
					
						
						
							
							Switched over to use the new jobs framework  
						
						 
						
						
						
						
					 
					
						2013-08-02 11:07:55 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kishan Kavala 
							
						 
					 
					
						
						
						
						
							
						
						
							536fd0e8a1 
							
						 
					 
					
						
						
							
							CLOUDSTACK-4005: Do not allow snapshot on zone wide primary storage when KVM.snapshot.enabled is set to false  
						
						 
						
						
						
						
					 
					
						2013-08-02 18:04:28 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Bharat Kumar 
							
						 
					 
					
						
						
						
						
							
						
						
							65370f31bc 
							
						 
					 
					
						
						
							
							upgrade to ASF 4.2 "cloud" Database Schema Inconsistencies on the Upgraded Setup - Table "volumes"  
						
						 
						
						... 
						
						
						
						Signed-off-by: Abhinandan Prateek <aprateek@apache.org> 
						
						
					 
					
						2013-08-02 17:07:22 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Fang Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							8f7b90badf 
							
						 
					 
					
						
						
							
							CLOUDSTACK-3759 [Automation] Failed to attach volume to VM, while vm are in stopped state Fix the null pointer.  
						
						 
						
						... 
						
						
						
						Signed-off-by: Edison Su <sudison@gmail.com> 
						
						
					 
					
						2013-08-01 17:47:11 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Harikrishna Patnala 
							
						 
					 
					
						
						
						
						
							
						
						
							f12adfff8a 
							
						 
					 
					
						
						
							
							CLOUDSTACK-3042: handle System VM Scaling up of memory/CPU based on the presence of tools in the template  
						
						 
						
						... 
						
						
						
						Signed off by : Nitin Mehta<nitin.mehta@citrix.com> 
						
						
					 
					
						2013-08-01 12:20:48 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							4eefce15be 
							
						 
					 
					
						
						
							
							CLOUDSTACK-3950: the issue can be reproduced by: copy iso failed during the first time, for some reason, then copy the same iso again, the issue be triggered.  
						
						 
						
						
						
						
					 
					
						2013-07-31 15:49:48 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Prachi Damle 
							
						 
					 
					
						
						
						
						
							
						
						
							a8360e41c0 
							
						 
					 
					
						
						
							
							CLOUDSTACK-3942 NPE from findStoragePool method  
						
						 
						
						... 
						
						
						
						Changes:
- Added null checks for podId
Conflicts:
	server/src/com/cloud/storage/StorageManagerImpl.java 
						
						
					 
					
						2013-07-30 17:53:31 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							1e1ee902a2 
							
						 
					 
					
						
						
							
							Moved over the new jobs framework from vmsync.  This has not been integrated into the server package yet.  Will do that next  
						
						 
						
						
						
						
					 
					
						2013-07-30 15:00:58 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							730d045085 
							
						 
					 
					
						
						
							
							CLOUDSTACK-3857: create VOLUME_CREATE event at CreateVolumeCmd instead  
						
						 
						
						... 
						
						
						
						of at AttachVolumeCmd. 
						
						
					 
					
						2013-07-30 14:51:02 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							42da3efbc3 
							
						 
					 
					
						
						
							
							CLOUDSTACK-3862: Remove S3/Swift-backed Secondary Storage Code.  
						
						 
						
						
						
						
					 
					
						2013-07-29 14:31:33 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							ae534388c0 
							
						 
					 
					
						
						
							
							CLOUDSTACK-3852: fix upload volume  
						
						 
						
						... 
						
						
						
						Conflicts:
	plugins/hypervisors/vmware/src/com/cloud/hypervisor/guru/VMwareGuru.java
	server/src/com/cloud/template/TemplateManagerImpl.java 
						
						
					 
					
						2013-07-29 11:50:16 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							d64c318f57 
							
						 
					 
					
						
						
							
							CLOUDSTACK-3510  
						
						 
						
						... 
						
						
						
						Persist the download url in the db for volume download.
Signed off by : nitin mehta<nitin.mehta@citrix.com>
Conflicts:
	server/src/com/cloud/storage/VolumeManagerImpl.java 
						
						
					 
					
						2013-07-29 11:50:15 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Rajesh Battala 
							
						 
					 
					
						
						
						
						
							
						
						
							1b398aa3fc 
							
						 
					 
					
						
						
							
							CLOUDSTACK-3846 usage event is not generated for volume resize  
						
						 
						
						
						
						
					 
					
						2013-07-29 18:51:00 +05:30