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 
						 
				 
			
				
					
						
							
							
								Nitin Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							ce90837357 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6826: Improving the download url expiration where the expiration work would be handled by the ssvm that has the corresponding symlink created on it. In case it doesnt exist, then would be any one of the ssvm in the zone.  
						
						... 
						
						
						
						Also when the ssvm is destroyed all the download urls are expired to be cleaned up in the next run by the new ssvm. 
						
						
					 
					
						2014-10-10 16:28:48 -07:00 
						 
				 
			
				
					
						
							
							
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							dc3f0cbc63 
							
						 
					 
					
						
						
							
							Improve the handling of the findbug exclude files  
						
						
						
						
					 
					
						2014-09-03 10:41:22 +02:00 
						 
				 
			
				
					
						
							
							
								Nitin Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							5393387bbd 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6599:  
						
						... 
						
						
						
						1. Adding the missing Template/Volume URLs expiration functionality
2. Improvement - While deleting the volume during expiration use rm -rf as vmware now contains directoy
3. Improvement - Use standard Answer so that the error gets logged in case deletion of expiration link didnt work fine.
4. Improvement - In case of domain change, expire the old urls 
						
						
					 
					
						2014-05-30 10:48:42 -07: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 
						 
				 
			
				
					
						
							
							
								John Kinsella 
							
						 
					 
					
						
						
						
						
							
						
						
							09c375379d 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6204: removing realhostip dependency  
						
						... 
						
						
						
						Moving default transport for console proxy, SSVM to http.
See
https://cwiki.apache.org/confluence/display/CLOUDSTACK/Realhost+IP+changes 
for more info.
jlk ported Amogh's patch for 4.3 to master - code base is different
enough that patch has multiple issues.
Author: Amogh Vasekar <Amogh Vasekar <amogh.vasekar@citrix.com>
Signed-off-by: John Kinsella <jlk@stratosec.co> 1394398017 -0700 
						
						
					 
					
						2014-03-09 13:46:57 -07:00 
						 
				 
			
				
					
						
							
							
								Saksham Srivastava 
							
						 
					 
					
						
						
						
						
							
						
						
							06f8c1de75 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5692: obscure passwords when using cifs as storage  
						
						
						
						
					 
					
						2014-01-17 14:00:24 +05:30 
						 
				 
			
				
					
						
							
							
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							be5e5cc641 
							
						 
					 
					
						
						
							
							All Checkstyle problems corrected  
						
						
						
						
					 
					
						2013-12-12 12:26:07 -08:00 
						 
				 
			
				
					
						
							
							
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							f420b74890 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5355: addImageStore should not log password in clear text in  
						
						... 
						
						
						
						the log. 
						
						
					 
					
						2013-12-03 16:55:26 -08:00 
						 
				 
			
				
					
						
							
							
								Wei Zhou 
							
						 
					 
					
						
						
						
						
							
						
						
							9be402cb06 
							
						 
					 
					
						
						
							
							CLOUDSTACK-2940: Allowing Replacement of realhostip.com with a customized domain for SSVM  
						
						... 
						
						
						
						(cherry picked from commit e23b10319f55fe8cbb822c0c29dc64b56509c119)
    Conflicts:
        plugins/storage/image/default/src/org/apache/cloudstack/storage/datastore/driver/CloudStackImageStoreDriverImpl.java
        server/src/com/cloud/storage/upload/UploadMonitorImpl.java 
						
						
					 
					
						2013-11-26 15:01:23 +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 
						 
				 
			
				
					
						
							
							
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							1292b76c63 
							
						 
					 
					
						
						
							
							Add a new method on datastoredriver: getCapabilities, which will be called by liststoragepoolcmd. UI can make decision based on the capabilities of the storage.  
						
						... 
						
						
						
						And also add a new table: snapshotdetails 
						
						
					 
					
						2013-11-14 15:55:39 -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 
							
						 
					 
					
						
						
						
						
							
						
						
							e3280bdba2 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/spring-modularization'  
						
						... 
						
						
						
						Conflicts:
	client/tomcatconf/applicationContext.xml.in
	client/tomcatconf/nonossComponentContext.xml.in
	client/tomcatconf/simulatorComponentContext.xml.in
	framework/db/src/com/cloud/utils/db/Transaction.java
	plugins/hypervisors/simulator/src/com/cloud/agent/manager/MockAgentManagerImpl.java
	server/src/com/cloud/api/ApiServer.java
	server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java 
						
						
					 
					
						2013-10-23 11:14:42 -07:00 
						 
				 
			
				
					
						
							
							
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							25acfbad78 
							
						 
					 
					
						
						
							
							CLOUDSTACK-4816:provide configurable option to choose single vs  
						
						... 
						
						
						
						multipart upload to S3 object storage based on object size. 
						
						
					 
					
						2013-10-17 10:28:59 -07:00 
						 
				 
			
				
					
						
							
							
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							f1895ea39a 
							
						 
					 
					
						
						
							
							CLOUDSTACK-4816: Make S3 upload multipart or singlepart configurable.  
						
						
						
						
					 
					
						2013-10-04 18:21:25 -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 
						 
				 
			
				
					
						
							
							
								Donal Lafferty 
							
						 
					 
					
						
						
						
						
							
						
						
							e958f22ff3 
							
						 
					 
					
						
						
							
							CIFS support for secondary storage is documented here:  https://cwiki.apache.org/confluence/display/CLOUDSTACK/CIFS+Support  
						
						... 
						
						
						
						It was implemented by extending the NFS provider. Its validation was updated so that you can pass it a URL containing the
details of a CIFS share.  The code that mounts NFS shares was extended to allow it do the same for CIFS shares.  Otherwise,
the secondary storage code is left unchanged. 
						
						
					 
					
						2013-09-11 14:23:29 +05:30 
						 
				 
			
				
					
						
							
							
								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 
						 
				 
			
				
					
						
							
							
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							f23c7d21a1 
							
						 
					 
					
						
						
							
							CLOUDSTACK-3987: Setting extract.url.expiration.interval is not honored  
						
						... 
						
						
						
						for S3 generated url, which is hard-coded to 1 hour. 
						
						
					 
					
						2013-07-31 16:30:46 -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 
						 
				 
			
				
					
						
							
							
								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 
							
						 
					 
					
						
						
						
						
							
						
						
							94aa67eae0 
							
						 
					 
					
						
						
							
							fix simulator  
						
						
						
						
					 
					
						2013-07-09 10:42:03 -07:00 
						 
				 
			
				
					
						
							
							
								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 
						 
				 
			
				
					
						
							
							
								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 
						 
				 
			
				
					
						
							
							
								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