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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chip Childers
							
						 
					 | 
					
						
						
						
						
							
						
						
							8225374138
							
						
					 | 
					
						
						
							
							Updating pom.xml version numbers for release 4.3.0-SNAPSHOT
						
						
						
						
						
						
						
						Signed-off-by: Chip Childers <chipchilders@apache.org> 
						
						
					 | 
					
						2013-08-01 10:35:00 -04: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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Alex Huang
							
						 
					 | 
					
						
						
						
						
							
						
						
							c2752ba93c
							
						
					 | 
					
						
						
							
							Removed mysql as any dependency
						
						
						
						
						
						
					 | 
					
						2013-07-26 20:35:48 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								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
							
						 
					 | 
					
						
						
						
						
							
						
						
							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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Edison Su
							
						 
					 | 
					
						
						
						
						
							
						
						
							2d544e7127
							
						
					 | 
					
						
						
							
							volume related operation works
						
						
						
						
						
						
					 | 
					
						2013-05-06 18:27:15 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Min Chen
							
						 
					 | 
					
						
						
						
						
							
						
						
							0d78209b73
							
						
					 | 
					
						
						
							
							Address various UI requirements by introducing provider constants.
						
						
						
						
						
						
					 | 
					
						2013-05-06 15:12:33 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Min Chen
							
						 
					 | 
					
						
						
						
						
							
						
						
							c60c373a38
							
						
					 | 
					
						
						
							
							Modify DownloadCommand to pass DataTO.
						
						
						
						
						
						
					 | 
					
						2013-05-02 23:05:19 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Min Chen
							
						 
					 | 
					
						
						
						
						
							
						
						
							87fafb7287
							
						
					 | 
					
						
						
							
							Add S3 register template integration test.
						
						
						
						
						
						
					 | 
					
						2013-05-02 15:20:46 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Min Chen
							
						 
					 | 
					
						
						
						
						
							
						
						
							36c1538f06
							
						
					 | 
					
						
						
							
							Bugfix to make deployDataCenter.py work.
						
						
						
						
						
						
					 | 
					
						2013-04-30 17:42:48 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Edison Su
							
						 
					 | 
					
						
						
						
						
							
						
						
							99dcb23b1c
							
						
					 | 
					
						
						
							
							fix build
						
						
						
						
						
						
					 | 
					
						2013-04-29 19:37:47 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Min Chen
							
						 
					 | 
					
						
						
						
						
							
						
						
							5b7ea8b0fe
							
						
					 | 
					
						
						
							
							Remove DeleteObjectFromSwiftCommand, which can be achieved through
						
						
						
						
						
						
						
						DeleteTemplateCommand. 
						
						
					 | 
					
						2013-04-26 17:52:50 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Min Chen
							
						 
					 | 
					
						
						
						
						
							
						
						
							c2e9be8d31
							
						
					 | 
					
						
						
							
							Handle DeleteVolumeCommand for S3.
						
						
						
						
						
						
					 | 
					
						2013-04-26 16:45:11 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Min Chen
							
						 
					 | 
					
						
						
						
						
							
						
						
							91bfbdf1c4
							
						
					 | 
					
						
						
							
							Handle ListTemplateCommand in NfsSecondaryStorageResource for various
						
						
						
						
						
						
						
						data store provider. 
						
						
					 | 
					
						2013-04-26 12:25:06 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Min Chen
							
						 
					 | 
					
						
						
						
						
							
						
						
							79151f5f5d
							
						
					 | 
					
						
						
							
							Remove sendToSSVM reference from SnapshotManagerImpl and
						
						
						
						
						
						
						
						TemplateManagerImpl. 
						
						
					 | 
					
						2013-04-24 17:45:32 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Min Chen
							
						 
					 | 
					
						
						
						
						
							
						
						
							4c174a6867
							
						
					 | 
					
						
						
							
							Fix DeleteSnapshotBackupCommand to pass dataStore information.
						
						
						
						
						
						
					 | 
					
						2013-04-24 17:30:38 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Min Chen
							
						 
					 | 
					
						
						
						
						
							
						
						
							792fc471a2
							
						
					 | 
					
						
						
							
							Remove VolumeHostDao references from codebase.
						
						
						
						
						
						
					 | 
					
						2013-04-24 11:11:58 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Min Chen
							
						 
					 | 
					
						
						
						
						
							
						
						
							7543f314a7
							
						
					 | 
					
						
						
							
							Remove more VMTemplateHostDao references.
						
						
						
						
						
						
					 | 
					
						2013-04-23 17:12:21 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Edison Su
							
						 
					 | 
					
						
						
						
						
							
						
						
							b8c5c67fbc
							
						
					 | 
					
						
						
							
							add copycommand at resouce side
						
						
						
						
						
						
					 | 
					
						2013-04-22 19:12:50 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Min Chen
							
						 
					 | 
					
						
						
						
						
							
						
						
							9c584b5500
							
						
					 | 
					
						
						
							
							Use EndPoint to send local/remote command, and hide agentMgr message
						
						
						
						
						
						
						
						passing. 
						
						
					 | 
					
						2013-04-22 13:21:28 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Min Chen
							
						 
					 | 
					
						
						
						
						
							
						
						
							ffdf567b58
							
						
					 | 
					
						
						
							
							Add implemention to pick EndPoint for secondary storage
						
						
						
						
						
						
					 | 
					
						2013-04-22 13:19:04 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Edison Su
							
						 
					 | 
					
						
						
						
						
							
						
						
							0a6e386997
							
						
					 | 
					
						
						
							
							fix callback installation
						
						
						
						
						
						
					 | 
					
						2013-04-22 11:18:48 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Edison Su
							
						 
					 | 
					
						
						
						
						
							
						
						
							abf40435f3
							
						
					 | 
					
						
						
							
							refactor downloadlistener, sync system vm templates when adding a new image store
						
						
						
						
						
						
					 | 
					
						2013-04-21 22:46:02 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Min Chen
							
						 
					 | 
					
						
						
						
						
							
						
						
							1b3994e180
							
						
					 | 
					
						
						
							
							Fix copyTemplateCmd.
						
						
						
						
						
						
					 | 
					
						2013-04-16 16:38:14 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Min Chen
							
						 
					 | 
					
						
						
						
						
							
						
						
							0da2da852b
							
						
					 | 
					
						
						
							
							Fix the flow of deleteTemplateCmd.
						
						
						
						
						
						
					 | 
					
						2013-04-16 12:03:12 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Min Chen
							
						 
					 | 
					
						
						
						
						
							
						
						
							593337565e
							
						
					 | 
					
						
						
							
							Add S3 code to handle DownloadCommand for registerTemplate.
						
						
						
						
						
						
					 | 
					
						2013-04-15 14:44:39 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Min Chen
							
						 
					 | 
					
						
						
						
						
							
						
						
							2dd8e2cb97
							
						
					 | 
					
						
						
							
							add getStoreTO into each DataStoreDriver, and add implementation for 3
						
						
						
						
						
						
						
						data store plugins. 
						
						
					 | 
					
						2013-04-12 18:22:23 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Edison Su
							
						 
					 | 
					
						
						
						
						
							
						
						
							b81fa6d9ea
							
						
					 | 
					
						
						
							
							add copy template to cache store
						
						
						
						
						
						
					 | 
					
						2013-04-12 16:03:30 -07:00 | 
					
					
						
						
							
							
							
						
					 |