Rajani Karuturi 
							
						 
					 
					
						
						
						
						
							
						
						
							4bc7c270fa 
							
						 
					 
					
						
						
							
							Updating pom.xml version numbers for release 4.11.0.0-SNAPSHOT  
						
						... 
						
						
						
						Signed-off-by: Rajani Karuturi <rajanikaruturi@gmail.com> 
						
						
					 
					
						2017-07-12 12:09:38 +05:30 
						 
				 
			
				
					
						
							
							
								Rajani Karuturi 
							
						 
					 
					
						
						
						
						
							
						
						
							9d2893d44a 
							
						 
					 
					
						
						
							
							Updating pom.xml version numbers for release 4.10.0.0  
						
						... 
						
						
						
						Signed-off-by: Rajani Karuturi <rajanikaruturi@gmail.com> 
						
						
					 
					
						2017-07-03 10:06:43 +05:30 
						 
				 
			
				
					
						
							
							
								Rohit Yadav 
							
						 
					 
					
						
						
						
						
							
						
						
							0dce1c50c1 
							
						 
					 
					
						
						
							
							CLOUDSTACK-9456: Update Spring version in maven poms  
						
						... 
						
						
						
						- Bump spring-framework version to 4.x and Jetty to version that runs with JDK8
- Bump servet dependency version
- Migrate spring xmls to version 4, fixes schema locations that are 3.0
  dependent in various xmls.
- Fix failing tests due to spring upgrade
  (Thanks @marcaurele Marc-Aurèle Brothier for fixing them)
    * Fix test DeploymentPlanningManagerImplTest
    * Fix GloboDNS test
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com> 
						
						
					 
					
						2016-12-16 21:21:20 +05:30 
						 
				 
			
				
					
						
							
							
								Rohit Yadav 
							
						 
					 
					
						
						
						
						
							
						
						
							9555492b4d 
							
						 
					 
					
						
						
							
							Merge branch '4.9'  
						
						
						
						
					 
					
						2016-08-23 14:16:53 +05:30 
						 
				 
			
				
					
						
							
							
								Rohit Yadav 
							
						 
					 
					
						
						
						
						
							
						
						
							f13c224da1 
							
						 
					 
					
						
						
							
							Updating pom.xml version numbers for release 4.9.1.0-SNAPSHOT  
						
						... 
						
						
						
						Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com> 
						
						
					 
					
						2016-08-19 13:53:39 +05:30 
						 
				 
			
				
					
						
							
							
								Will Stevens 
							
						 
					 
					
						
						
						
						
							
						
						
							62aa3b2bfa 
							
						 
					 
					
						
						
							
							Updating pom.xml version numbers for release 4.10.0-SNAPSHOT  
						
						... 
						
						
						
						Signed-off-by: Will Stevens <williamstevens@gmail.com> 
						
						
					 
					
						2016-07-29 10:11:34 -04:00 
						 
				 
			
				
					
						
							
							
								Will Stevens 
							
						 
					 
					
						
						
						
						
							
						
						
							227ff3884d 
							
						 
					 
					
						
						
							
							Updating pom.xml version numbers for release 4.9.0  
						
						... 
						
						
						
						Signed-off-by: Will Stevens <williamstevens@gmail.com> 
						
						
					 
					
						2016-07-25 16:56:04 -04:00 
						 
				 
			
				
					
						
							
							
								Will Stevens 
							
						 
					 
					
						
						
						
						
							
						
						
							f7c3957af3 
							
						 
					 
					
						
						
							
							Merge release branch 4.8 to master  
						
						... 
						
						
						
						* 4.8:
  Add ability to download templates in Swift 
						
						
					 
					
						2016-04-06 14:33:39 -04:00 
						 
				 
			
				
					
						
							
							
								Will Stevens 
							
						 
					 
					
						
						
						
						
							
						
						
							bb82f9a7fa 
							
						 
					 
					
						
						
							
							Merge release branch 4.7 to 4.8  
						
						... 
						
						
						
						* 4.7:
  Add ability to download templates in Swift 
						
						
					 
					
						2016-04-06 14:32:08 -04:00 
						 
				 
			
				
					
						
							
							
								Will Stevens 
							
						 
					 
					
						
						
						
						
							
						
						
							ef115ab1d0 
							
						 
					 
					
						
						
							
							Merge pull request  #1332  from syed/swift-download  
						
						... 
						
						
						
						Add ability to download templates in SwiftThis PR adds the ability to download templates when using Swift as a secondary storage. Uses the "temp_url" feature of Swift so that tempates can be downloaded without authenticaiton.
* pr/1332:
  Add ability to download templates in Swift
Signed-off-by: Will Stevens <williamstevens@gmail.com> 
						
						
					 
					
						2016-04-06 14:19:44 -04:00 
						 
				 
			
				
					
						
							
							
								Syed 
							
						 
					 
					
						
						
						
						
							
						
						
							52fc2bab69 
							
						 
					 
					
						
						
							
							Add ability to download templates in Swift  
						
						
						
						
					 
					
						2016-04-05 16:40:00 -04:00 
						 
				 
			
				
					
						
							
							
								Remi Bergsma 
							
						 
					 
					
						
						
						
						
							
						
						
							43ab98d823 
							
						 
					 
					
						
						
							
							Updating pom.xml version numbers for release 4.9.0-SNAPSHOT  
						
						... 
						
						
						
						Signed-off-by: Remi Bergsma <github@remi.nl> 
						
						
					 
					
						2016-01-26 15:12:20 +01:00 
						 
				 
			
				
					
						
							
							
								Remi Bergsma 
							
						 
					 
					
						
						
						
						
							
						
						
							32fcc47117 
							
						 
					 
					
						
						
							
							Updating pom.xml version numbers for release 4.8.1-SNAPSHOT  
						
						... 
						
						
						
						Signed-off-by: Remi Bergsma <github@remi.nl> 
						
						
					 
					
						2016-01-26 09:39:00 +01:00 
						 
				 
			
				
					
						
							
							
								Remi Bergsma 
							
						 
					 
					
						
						
						
						
							
						
						
							a4ac9d3fff 
							
						 
					 
					
						
						
							
							Updating pom.xml version numbers for release 4.7.2-SNAPSHOT  
						
						... 
						
						
						
						Signed-off-by: Remi Bergsma <github@remi.nl> 
						
						
					 
					
						2016-01-26 09:33:56 +01:00 
						 
				 
			
				
					
						
							
							
								Remi Bergsma 
							
						 
					 
					
						
						
						
						
							
						
						
							62f218b7bd 
							
						 
					 
					
						
						
							
							Updating pom.xml version numbers for release 4.8.0  
						
						... 
						
						
						
						Signed-off-by: Remi Bergsma <github@remi.nl> 
						
						
					 
					
						2016-01-20 23:43:35 +01:00 
						 
				 
			
				
					
						
							
							
								Remi Bergsma 
							
						 
					 
					
						
						
						
						
							
						
						
							8f5a2920e8 
							
						 
					 
					
						
						
							
							Updating pom.xml version numbers for release 4.8.0-SNAPSHOT  
						
						... 
						
						
						
						Signed-off-by: Remi Bergsma <github@remi.nl> 
						
						
					 
					
						2015-12-21 22:09:31 +01:00 
						 
				 
			
				
					
						
							
							
								Remi Bergsma 
							
						 
					 
					
						
						
						
						
							
						
						
							5b112408c7 
							
						 
					 
					
						
						
							
							Updating pom.xml version numbers for release 4.7.1-SNAPSHOT  
						
						... 
						
						
						
						Signed-off-by: Remi Bergsma <github@remi.nl> 
						
						
					 
					
						2015-12-21 19:55:04 +01:00 
						 
				 
			
				
					
						
							
							
								Remi Bergsma 
							
						 
					 
					
						
						
						
						
							
						
						
							2f26a859a9 
							
						 
					 
					
						
						
							
							Updating pom.xml version numbers for release 4.7.0  
						
						... 
						
						
						
						Signed-off-by: Remi Bergsma <github@remi.nl> 
						
						
					 
					
						2015-12-13 21:09:53 +01:00 
						 
				 
			
				
					
						
							
							
								Remi Bergsma 
							
						 
					 
					
						
						
						
						
							
						
						
							1f53f2a93e 
							
						 
					 
					
						
						
							
							Updating pom.xml version numbers for release 4.7.0-SNAPSHOT  
						
						... 
						
						
						
						Signed-off-by: Remi Bergsma <github@remi.nl> 
						
						
					 
					
						2015-11-15 18:54:13 +01:00 
						 
				 
			
				
					
						
							
							
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							4ebaf0a583 
							
						 
					 
					
						
						
							
							Bump master version to 4.6.0-SNAPSHOT after branching 4.5.0-SNAPSHOT  
						
						
						
						
					 
					
						2014-10-29 14:54:23 +01:00 
						 
				 
			
				
					
						
							
							
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							dc3f0cbc63 
							
						 
					 
					
						
						
							
							Improve the handling of the findbug exclude files  
						
						
						
						
					 
					
						2014-09-03 10:41:22 +02:00 
						 
				 
			
				
					
						
							
							
								Daan Hoogland 
							
						 
					 
					
						
						
						
						
							
						
						
							8b62b2cb92 
							
						 
					 
					
						
						
							
							findbugs: exclude known spiffy hacks a.k.a. false positives  
						
						
						
						
					 
					
						2014-03-28 14:28:10 +01:00 
						 
				 
			
				
					
						
							
							
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							4402685e11 
							
						 
					 
					
						
						
							
							Update master to 4.5.0-SNAPSHOT  
						
						
						
						
					 
					
						2014-03-14 14:55:26 +01:00 
						 
				 
			
				
					
						
							
							
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							433a631916 
							
						 
					 
					
						
						
							
							Reformat of source code to set a stable base for the future.  I couldn't get checkstyle enabled.  There's still about a thousand errors from checkstyle.  Most of it from length errors from comments and strings.  Will attempt to remove those tonight.  This change is so large I just want to get it in before any merge nightmares.  The changes are fairly minor though and I did a full compile and start a server with the reformat code.  
						
						
						
						
					 
					
						2013-11-21 07:56:47 -08:00 
						 
				 
			
				
					
						
							
							
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							cf715ff491 
							
						 
					 
					
						
						
							
							Bump 4.3.0 to 4.4.0 in master  
						
						
						
						
					 
					
						2013-11-21 16:01:15 +01:00 
						 
				 
			
				
					
						
							
							
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							d620df2bdd 
							
						 
					 
					
						
						
							
							Reformatted all of the code.  
						
						
						
						
					 
					
						2013-11-21 06:15:26 -08:00 
						 
				 
			
				
					
						
							
							
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							8d62744681 
							
						 
					 
					
						
						
							
							Reformat all source code.  Added checkstyle to check the source code  
						
						
						
						
					 
					
						2013-11-20 07:26:53 -08:00 
						 
				 
			
				
					
						
							
							
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							6eecb0b3b5 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5017: If SSVM is unavailable DownloadCommands will be routed  
						
						... 
						
						
						
						to mgmt server. 
						
						
					 
					
						2013-11-01 18:07:00 -07:00 
						 
				 
			
				
					
						
							
							
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							6be228a438 
							
						 
					 
					
						
						
							
							CLOUDSTACK-4024:Provide a way to upgrade from existing NFS secondary  
						
						... 
						
						
						
						storage to S3. 
						
						
					 
					
						2013-10-28 21:01:31 -07:00 
						 
				 
			
				
					
						
							
							
								Darren Shepherd 
							
						 
					 
					
						
						
						
						
							
						
						
							891b85d516 
							
						 
					 
					
						
						
							
							Add missing licenses  
						
						
						
						
					 
					
						2013-10-23 15:20:08 -07:00 
						 
				 
			
				
					
						
							
							
								Darren Shepherd 
							
						 
					 
					
						
						
						
						
							
						
						
							67186429e1 
							
						 
					 
					
						
						
							
							Spring Modularization  
						
						... 
						
						
						
						ACS is now comprised of a hierarchy of spring application contexts.
Each plugin can contribute configuration files to add to an existing
module or create it's own module.
Additionally, for the mgmt server, ACS custom AOP is no longer used
and instead we use Spring AOP to manage interceptors. 
						
						
					 
					
						2013-10-02 15:41:04 -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 
						 
				 
			
				
					
						
							
							
								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 
						 
				 
			
				
					
						
							
							
								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 
						 
				 
			
				
					
						
							
							
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							d1704a389a 
							
						 
					 
					
						
						
							
							Exclude removed template from template sync.  
						
						
						
						
					 
					
						2013-05-23 17:23:25 -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 
						 
				 
			
				
					
						
							
							
								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 
						 
				 
			
				
					
						
							
							
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							993187622e 
							
						 
					 
					
						
						
							
							fix compile, after rebase to master  
						
						
						
						
					 
					
						2013-05-10 20:39:02 -07:00 
						 
				 
			
				
					
						
							
							
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							42e25a22fc 
							
						 
					 
					
						
						
							
							refactor kvm/vmware resource code  
						
						
						
						
					 
					
						2013-05-09 23:10:05 -07:00