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 
						 
				 
			
				
					
						
							
							
								Devdeep Singh 
							
						 
					 
					
						
						
						
						
							
						
						
							d06a5bc5f0 
							
						 
					 
					
						
						
							
							CLOUDSTACK-3890. Delting the storage pool is not getting from xenserver. The  
						
						... 
						
						
						
						storage pool entry was removed from the db but the pool wasn't unmounted from
the host. There was a check that if the pool is not in UP state then the entry
can just be removed. That is wrong. A pool can only be removed if it is in
maintenance state. So after putting the pool in maintenance state if admin
tries to delete the pool we just remove the db entry without un-mounting the
storage pool from the host. Removed the incorrect check. 
						
						
					 
					
						2013-07-29 17:26:55 +05:30 
						 
				 
			
				
					
						
							
							
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							c2752ba93c 
							
						 
					 
					
						
						
							
							Removed mysql as any dependency  
						
						
						
						
					 
					
						2013-07-26 20:35:48 -07:00 
						 
				 
			
				
					
						
							
							
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							fa358cf01f 
							
						 
					 
					
						
						
							
							CLOUDSTACK-2630: fix delta snashpt  
						
						
						
						
					 
					
						2013-07-24 09:48:41 -07:00 
						 
				 
			
				
					
						
							
							
								Sanjay Tripathi 
							
						 
					 
					
						
						
						
						
							
						
						
							6e63f10a4f 
							
						 
					 
					
						
						
							
							CLOUDSTACK-2510: Getting NPE while executinng listStoragePools API command.  
						
						
						
						
					 
					
						2013-07-19 16:02:08 +05:30 
						 
				 
			
				
					
						
							
							
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							5af61a85ae 
							
						 
					 
					
						
						
							
							Fixed build.  Not sure why it didn't come up on my compile before the commit  
						
						
						
						
					 
					
						2013-07-18 22:53:30 -07:00 
						 
				 
			
				
					
						
							
							
								Mike Tutkowski 
							
						 
					 
					
						
						
						
						
							
						
						
							5bcb6ec9ca 
							
						 
					 
					
						
						
							
							Changes related to Review Board comments  
						
						
						
						
					 
					
						2013-07-13 23:43:48 -06:00 
						 
				 
			
				
					
						
							
							
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							8f4575e877 
							
						 
					 
					
						
						
							
							CLOUDSTACK-3400: add swift support  
						
						
						
						
					 
					
						2013-07-13 02:07:15 -07:00 
						 
				 
			
				
					
						
							
							
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							0c1ae20e77 
							
						 
					 
					
						
						
							
							add inital swift support  
						
						... 
						
						
						
						Conflicts:
	server/src/com/cloud/resource/ResourceManagerImpl.java
	server/test/com/cloud/resource/MockResourceManagerImpl.java 
						
						
					 
					
						2013-07-13 02:07:03 -07:00 
						 
				 
			
				
					
						
							
							
								Vijayendra Bhamidipati 
							
						 
					 
					
						
						
						
						
							
						
						
							7ea8c5fd9a 
							
						 
					 
					
						
						
							
							CLOUDSTACK-1510: NPE when primary storage is added with wrong path  
						
						... 
						
						
						
						Description:
	a) Fixing NPE when wrong path is provided for primary datastore.
	b) No error dialog shows up in GUI when wrong path is provided,
	   after NPE fix - propagating exception upward.
	c) If the KVM agent is down, an invalid datastore gets logged in
	   storage_pool table and doesn't get removed, so it shows up
	   in the GUI in the list of datastores - fixing this as well. 
						
						
					 
					
						2013-07-10 14:55:57 -07:00 
						 
				 
			
				
					
						
							
							
								Mike Tutkowski 
							
						 
					 
					
						
						
						
						
							
						
						
							06f73092fb 
							
						 
					 
					
						
						
							
							Changes related to Review Board comments  
						
						
						
						
					 
					
						2013-07-09 22:50:14 -06:00 
						 
				 
			
				
					
						
							
							
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							94aa67eae0 
							
						 
					 
					
						
						
							
							fix simulator  
						
						
						
						
					 
					
						2013-07-09 10:42:03 -07:00 
						 
				 
			
				
					
						
							
							
								Prasanna Santhanam 
							
						 
					 
					
						
						
						
						
							
						
						
							bd784fb8ec 
							
						 
					 
					
						
						
							
							Include license header for solidfire util  
						
						... 
						
						
						
						Signed-off-by: Prasanna Santhanam <tsp@apache.org> 
						
						
					 
					
						2013-06-29 16:55:55 +05:30 
						 
				 
			
				
					
						
							
							
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							49ded7e4a3 
							
						 
					 
					
						
						
							
							the plugin better not touch database  
						
						
						
						
					 
					
						2013-06-29 15:09:43 +05:30 
						 
				 
			
				
					
						
							
							
								Prasanna Santhanam 
							
						 
					 
					
						
						
						
						
							
						
						
							57641d85f7 
							
						 
					 
					
						
						
							
							Set all templates/volumes to Ready in the simulator  
						
						... 
						
						
						
						Signed-off-by: Prasanna Santhanam <tsp@apache.org> 
						
						
					 
					
						2013-06-29 13:53:41 +05:30 
						 
				 
			
				
					
						
							
							
								Prasanna Santhanam 
							
						 
					 
					
						
						
						
						
							
						
						
							fd867d5afa 
							
						 
					 
					
						
						
							
							DataStore - provider, lifecycle, driver implementations for simulator  
						
						... 
						
						
						
						mock implementation to manage secondary storage related operations for
the simulator.
Signed-off-by: Prasanna Santhanam <tsp@apache.org> 
						
						
					 
					
						2013-06-29 13:52:16 +05:30 
						 
				 
			
				
					
						
							
							
								Prasanna Santhanam 
							
						 
					 
					
						
						
						
						
							
						
						
							de38cd815f 
							
						 
					 
					
						
						
							
							Fix typo in class name  
						
						... 
						
						
						
						AsyncRpcConext -> AsyncRpcContext
Signed-off-by: Prasanna Santhanam <tsp@apache.org> 
						
						
					 
					
						2013-06-29 13:50:25 +05:30 
						 
				 
			
				
					
						
							
							
								Mike Tutkowski 
							
						 
					 
					
						
						
						
						
							
						
						
							99227f7b3e 
							
						 
					 
					
						
						
							
							SolidFire plug-in and related changes  
						
						... 
						
						
						
						SolidFire plug-in
SolidFire plug-in related 
						
						
					 
					
						2013-06-28 16:59:21 -06:00 
						 
				 
			
				
					
						
							
							
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							1eb39665bd 
							
						 
					 
					
						
						
							
							CLOUDSTACK-3030: Object_Store_Refactor - Download template from S3  
						
						... 
						
						
						
						should not set template to public-readable. 
						
						
					 
					
						2013-06-18 09:45:50 -07:00 
						 
				 
			
				
					
						
							
							
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							1df4cf839e 
							
						 
					 
					
						
						
							
							CLOUDSTACK-3028: Object_Store_Refactor - S3 reduced redundancy storage  
						
						... 
						
						
						
						should be an option. 
						
						
					 
					
						2013-06-17 11:49:33 -07:00 
						 
				 
			
				
					
						
							
							
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							a715eb8121 
							
						 
					 
					
						
						
							
							clean up storage related code, and add lru replacement algorithm for cache storage  
						
						
						
						
					 
					
						2013-06-14 15:55:59 -07:00 
						 
				 
			
				
					
						
							
							
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							18aeef3ef1 
							
						 
					 
					
						
						
							
							Merge branch 'master' (up to commit  
						
						... 
						
						
						
						c30d9be3cea30339cfff40c1002906634291b373) into object_store. 
						
						
					 
					
						2013-06-12 11:20:32 -07:00 
						 
				 
			
				
					
						
							
							
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							66e702222d 
							
						 
					 
					
						
						
							
							Simplify various DeleteTemplateCommnad,  DeleteVolumeCommand and  
						
						... 
						
						
						
						DeleteSnapshotBackupCommand to use one DeleteCommand, also provide
BaseImageStoreDriverImpl class for plugin to inherit to avoid code
duplication. 
						
						
					 
					
						2013-06-06 18:00:38 -07:00 
						 
				 
			
				
					
						
							
							
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							ef03d5a122 
							
						 
					 
					
						
						
							
							Move data store specific extract template/iso logic from  
						
						... 
						
						
						
						TemplateManager to data store driver. 
						
						
					 
					
						2013-06-04 11:50:43 -07:00 
						 
				 
			
				
					
						
							
							
								Sateesh Chodapuneedi 
							
						 
					 
					
						
						
						
						
							
						
						
							7998413f48 
							
						 
					 
					
						
						
							
							CLOUDSTACK-2029 zone wide primary storage support for cloudstack over vmware deployments  
						
						... 
						
						
						
						Added hypervisor type to CreateStoragePoolCmd & Storage pool responses.
DatastoreLifeCycle would consider hypervisor type while attaching datastore to zone.
ZoneWideStoragePoolAllocator would filter zone wide primary storage pools by hypervisor type along with tags in disk profile.
hypervisor type is mandatory parameter if scope is specified as ZONE while creating primary storage pool.
As of now KVM, VMware are allowed to use ZoneWideStoragePoolAllocator.
Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org> 
						
						
					 
					
						2013-06-01 00:05:27 +05:30 
						 
				 
			
				
					
						
							
							
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							2473ceb111 
							
						 
					 
					
						
						
							
							Have different callback for create template and create volume since they  
						
						... 
						
						
						
						will update different tables. 
						
						
					 
					
						2013-05-30 17:39:44 -07:00 
						 
				 
			
				
					
						
							
							
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							0a5228922b 
							
						 
					 
					
						
						
							
							clean up storage related coded  
						
						
						
						
					 
					
						2013-05-29 18:04:37 -07:00 
						 
				 
			
				
					
						
							
							
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							8a1a51c6fc 
							
						 
					 
					
						
						
							
							Clean up deleteSnapshot agent command, since snapshot path is already  
						
						... 
						
						
						
						stored in snapshot_store_ref, no need to construct path in resource
side. 
						
						
					 
					
						2013-05-28 13:36:54 -07:00 
						 
				 
			
				
					
						
							
							
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							0ed441c690 
							
						 
					 
					
						
						
							
							CLOUDSTACK-2637: fix upload volume  
						
						
						
						
					 
					
						2013-05-24 19:00:52 -07:00 
						 
				 
			
				
					
						
							
							
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							d1704a389a 
							
						 
					 
					
						
						
							
							Exclude removed template from template sync.  
						
						
						
						
					 
					
						2013-05-23 17:23:25 -07:00 
						 
				 
			
				
					
						
							
							
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							755b9311a4 
							
						 
					 
					
						
						
							
							Fix some typo.  
						
						
						
						
					 
					
						2013-05-23 10:49:41 -07:00 
						 
				 
			
				
					
						
							
							
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							a4e6784e0b 
							
						 
					 
					
						
						
							
							CLOUDSTACK-2578: NPE in deleting template from S3.  
						
						
						
						
					 
					
						2013-05-21 14:43:32 -07:00 
						 
				 
			
				
					
						
							
							
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							ef541a2a7b 
							
						 
					 
					
						
						
							
							Fix CLOUDSTACK-2538: Add name as an optional parameter for addImageStore  
						
						... 
						
						
						
						api. 
						
						
					 
					
						2013-05-20 13:39:43 -07:00 
						 
				 
			
				
					
						
							
							
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							879a954b98 
							
						 
					 
					
						
						
							
							delete snapshot at the backend  
						
						
						
						
					 
					
						2013-05-14 21:58:07 -07:00 
						 
				 
			
				
					
						
							
							
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							564d3d6fa0 
							
						 
					 
					
						
						
							
							Fix CLOUDSTACK-2488: Delete iso async job is running forever.  
						
						
						
						
					 
					
						2013-05-14 16:12:49 -07:00 
						 
				 
			
				
					
						
							
							
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							95e7e270d4 
							
						 
					 
					
						
						
							
							Fix the hanging issue in deleting ISO referenced by some user vms.  
						
						
						
						
					 
					
						2013-05-14 14:57:02 -07:00 
						 
				 
			
				
					
						
							
							
								Nitin Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							c11dbad9c9 
							
						 
					 
					
						
						
							
							merge master  
						
						
						
						
					 
					
						2013-05-11 15:28:43 +05:30 
						 
				 
			
				
					
						
							
							
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							993187622e 
							
						 
					 
					
						
						
							
							fix compile, after rebase to master  
						
						
						
						
					 
					
						2013-05-10 20:39:02 -07:00 
						 
				 
			
				
					
						
							
							
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							342624e0eb 
							
						 
					 
					
						
						
							
							Merged with head  
						
						
						
						
					 
					
						2013-05-10 16:33:57 -07:00 
						 
				 
			
				
					
						
							
							
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							3047929367 
							
						 
					 
					
						
						
							
							Merged  
						
						
						
						
					 
					
						2013-05-10 16:21:43 -07:00 
						 
				 
			
				
					
						
							
							
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							42e25a22fc 
							
						 
					 
					
						
						
							
							refactor kvm/vmware resource code  
						
						
						
						
					 
					
						2013-05-09 23:10:05 -07:00 
						 
				 
			
				
					
						
							
							
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							dc5d2f45e9 
							
						 
					 
					
						
						
							
							Make copyFromS3ToNFS flow work.  
						
						
						
						
					 
					
						2013-05-08 17:39:46 -07:00 
						 
				 
			
				
					
						
							
							
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							ac1b75dc9f 
							
						 
					 
					
						
						
							
							Fix a bug in deleteTemplate return result.  
						
						
						
						
					 
					
						2013-05-07 17:58:45 -07:00 
						 
				 
			
				
					
						
							
							
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							8a514ea4b8 
							
						 
					 
					
						
						
							
							Update template size in VMTemplate table.  
						
						
						
						
					 
					
						2013-05-07 17:45:06 -07:00 
						 
				 
			
				
					
						
							
							
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							70f866156f 
							
						 
					 
					
						
						
							
							Fix a bug in updating template_store_ref entry.  
						
						
						
						
					 
					
						2013-05-07 17:45:06 -07:00 
						 
				 
			
				
					
						
							
							
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							26424ff2a8 
							
						 
					 
					
						
						
							
							Make url in AddImageStoreCmd not required since S3 does not have url.  
						
						
						
						
					 
					
						2013-05-06 22:14:49 -07:00 
						 
				 
			
				
					
						
							
							
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							9f7bad2cef 
							
						 
					 
					
						
						
							
							fix creating snapshot  
						
						
						
						
					 
					
						2013-05-06 18:27:15 -07:00 
						 
				 
			
				
					
						
							
							
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							2d544e7127 
							
						 
					 
					
						
						
							
							volume related operation works  
						
						
						
						
					 
					
						2013-05-06 18:27:15 -07:00 
						 
				 
			
				
					
						
							
							
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							ad2777c547 
							
						 
					 
					
						
						
							
							Moved agent commands to core and out of api  
						
						
						
						
					 
					
						2013-05-06 16:34:20 -07:00