Mike Tutkowski 
							
						 
					 
					
						
						
						
						
							
						
						
							3773ff060e 
							
						 
					 
					
						
						
							
							Update to volume-resize logic  
						
						
						
						
					 
					
						2014-08-21 20:18:20 -06:00 
						 
				 
			
				
					
						
							
							
								Santhosh Edukulla 
							
						 
					 
					
						
						
						
						
							
						
						
							c792f149fb 
							
						 
					 
					
						
						
							
							Build failed with checkstyle error because of unused imports, removed them  
						
						
						
						
					 
					
						2014-08-02 14:18:38 +05:30 
						 
				 
			
				
					
						
							
							
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							b5db68e2d1 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7226: in case lun number is not provided, addprimarystorage cmd should report error instead of NPE  
						
						
						
						
					 
					
						2014-08-01 16:23:30 -07:00 
						 
				 
			
				
					
						
							
							
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							ec43bfce90 
							
						 
					 
					
						
						
							
							Fix false positve in coverity, simple rewrite.  
						
						
						
						
					 
					
						2014-07-24 12:21:37 +02:00 
						 
				 
			
				
					
						
							
							
								Mike Tutkowski 
							
						 
					 
					
						
						
						
						
							
						
						
							08d7b46be7 
							
						 
					 
					
						
						
							
							Update to volume-resize logic  
						
						
						
						
					 
					
						2014-07-19 00:42:04 -06:00 
						 
				 
			
				
					
						
							
							
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							6c2acda5a3 
							
						 
					 
					
						
						
							
							Fixup licenses and enfore the license check in this plugin  
						
						
						
						
					 
					
						2014-07-18 11:40:51 +02:00 
						 
				 
			
				
					
						
							
							
								punith-cloudbyte 
							
						 
					 
					
						
						
						
						
							
						
						
							f3cbb69995 
							
						 
					 
					
						
						
							
							first commit of improvised cloudbyte storage plugin  
						
						... 
						
						
						
						Signed-off-by: Mike Tutkowski <mike.tutkowski@solidfire.com> 
						
						
					 
					
						2014-07-17 21:34:37 -06:00 
						 
				 
			
				
					
						
							
							
								Mike Tutkowski 
							
						 
					 
					
						
						
						
						
							
						
						
							b080eaf327 
							
						 
					 
					
						
						
							
							Updates to the way resizing a volume works  
						
						
						
						
					 
					
						2014-07-17 21:09:19 -06:00 
						 
				 
			
				
					
						
							
							
								Vania Xu 
							
						 
					 
					
						
						
						
						
							
						
						
							8bd9e78071 
							
						 
					 
					
						
						
							
							Adding SolidFire API plug-in  
						
						
						
						
					 
					
						2014-07-10 21:22:47 -06:00 
						 
				 
			
				
					
						
							
							
								Mike Tutkowski 
							
						 
					 
					
						
						
						
						
							
						
						
							83034907ca 
							
						 
					 
					
						
						
							
							Modification to the way SolidFire account info is stored in the DB  
						
						
						
						
					 
					
						2014-07-07 22:16:58 -06:00 
						 
				 
			
				
					
						
							
							
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							362b481176 
							
						 
					 
					
						
						
							
							Fix CID 1164032 Dodgy code  
						
						
						
						
					 
					
						2014-07-04 16:48:27 +02:00 
						 
				 
			
				
					
						
							
							
								Santhosh Edukulla 
							
						 
					 
					
						
						
						
						
							
						
						
							a600d8408e 
							
						 
					 
					
						
						
							
							Fixed Resource Leaks, null dereferences, few other issues reported by coverity  
						
						
						
						
					 
					
						2014-07-04 16:17:58 +05:30 
						 
				 
			
				
					
						
							
							
								Mike Tutkowski 
							
						 
					 
					
						
						
						
						
							
						
						
							c344693e48 
							
						 
					 
					
						
						
							
							Inform the applicable storage plug-in's life cycle that capacity (bytes and/or IOPS) can be updated  
						
						
						
						
					 
					
						2014-06-24 14:39:57 -06:00 
						 
				 
			
				
					
						
							
							
								Damodar Reddy 
							
						 
					 
					
						
						
						
						
							
						
						
							d3ffb7a565 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6444: Fixing the issue with iSCSI path Format /targetIQN/LUN.  
						
						... 
						
						
						
						Signed-off-by: Koushik Das <koushik@apache.org> 
						
						
					 
					
						2014-06-24 10:11:44 +05:30 
						 
				 
			
				
					
						
							
							
								Mike Tutkowski 
							
						 
					 
					
						
						
						
						
							
						
						
							49aa13e8e1 
							
						 
					 
					
						
						
							
							Changed some places where "SolidFire" was written with a small "f"  
						
						
						
						
					 
					
						2014-06-16 12:47:07 -06:00 
						 
				 
			
				
					
						
							
							
								Mike Tutkowski 
							
						 
					 
					
						
						
						
						
							
						
						
							42d00cae58 
							
						 
					 
					
						
						
							
							SolidFire (shared-access) Provider  
						
						
						
						
					 
					
						2014-06-16 12:15:29 -06: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 
						 
				 
			
				
					
						
							
							
								Ding Yuan 
							
						 
					 
					
						
						
						
						
							
						
						
							c031eb7d38 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6242: exception handling improvements  
						
						... 
						
						
						
						Signed-off-by: Daan Hoogland <daan@onecht.net> 
						
						
					 
					
						2014-04-15 08:07:15 +02:00 
						 
				 
			
				
					
						
							
							
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							25a6234a5b 
							
						 
					 
					
						
						
							
							fix build  
						
						
						
						
					 
					
						2014-03-28 16:24:45 -07:00 
						 
				 
			
				
					
						
							
							
								edison 
							
						 
					 
					
						
						
						
						
							
						
						
							6647802d08 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5573: bump gson version to 1.7.2, fix  https://code.google.com/p/google-gson/issues/detail?id=354  
						
						
						
						
					 
					
						2014-03-28 16:22:32 -07:00 
						 
				 
			
				
					
						
							
							
								Daan Hoogland 
							
						 
					 
					
						
						
						
						
							
						
						
							8b62b2cb92 
							
						 
					 
					
						
						
							
							findbugs: exclude known spiffy hacks a.k.a. false positives  
						
						
						
						
					 
					
						2014-03-28 14:28:10 +01:00 
						 
				 
			
				
					
						
							
							
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							0c1b6b44a8 
							
						 
					 
					
						
						
							
							add apache licence header for cloudbyte  
						
						
						
						
					 
					
						2014-03-18 15:02:02 -07:00 
						 
				 
			
				
					
						
							
							
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							0288a87045 
							
						 
					 
					
						
						
							
							pump the version  
						
						
						
						
					 
					
						2014-03-18 11:14:23 -07:00 
						 
				 
			
				
					
						
							
							
								punith-cloudbyte 
							
						 
					 
					
						
						
						
						
							
						
						
							f3c7c607bd 
							
						 
					 
					
						
						
							
							cloudbyte storage plugin for master commit  
						
						
						
						
					 
					
						2014-03-18 11:14:23 -07: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 
						 
				 
			
				
					
						
							
							
								Niels de Vos 
							
						 
					 
					
						
						
						
						
							
						
						
							fe83a85436 
							
						 
					 
					
						
						
							
							Add support for Primary Storage on Gluster using the libvirt backend  
						
						... 
						
						
						
						The support for Gluster as Primary Storage is mostly based on the
implementation for NFS. Like NFS, libvirt can address a Gluster environment
through the 'netfs' pool-type. 
						
						
					 
					
						2014-02-20 14:52:01 +01:00 
						 
				 
			
				
					
						
							
							
								wrodrigues 
							
						 
					 
					
						
						
						
						
							
						
						
							0ff943337c 
							
						 
					 
					
						
						
							
							fixing FindBugs scariest for replaceFirst() method call that does not assign the return value  
						
						... 
						
						
						
						Signed-off-by: Hugo Trippaers <htrippaers@schubergphilis.com> 
						
						
					 
					
						2014-02-14 18:37:44 +01:00 
						 
				 
			
				
					
						
							
							
								Devdeep Singh 
							
						 
					 
					
						
						
						
						
							
						
						
							a24263fe81 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6030: Encrypt the primary and secondary smb storage password when it is stored in the db.  
						
						
						
						
					 
					
						2014-02-05 15:44:09 +05:30 
						 
				 
			
				
					
						
							
							
								Mike Tutkowski 
							
						 
					 
					
						
						
						
						
							
						
						
							0846bfe1ff 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5873: [Automation] Failed to attach volume to VM, if the vm is created with option startvm=false  
						
						
						
						
					 
					
						2014-01-20 23:10:54 -07:00 
						 
				 
			
				
					
						
							
							
								Saksham Srivastava 
							
						 
					 
					
						
						
						
						
							
						
						
							06f8c1de75 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5692: obscure passwords when using cifs as storage  
						
						
						
						
					 
					
						2014-01-17 14:00:24 +05:30 
						 
				 
			
				
					
						
							
							
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							3f49f8ca61 
							
						 
					 
					
						
						
							
							Fix RAT  
						
						
						
						
					 
					
						2014-01-16 12:10:38 -08:00 
						 
				 
			
				
					
						
							
							
								Victor Rodionov 
							
						 
					 
					
						
						
						
						
							
						
						
							753b563947 
							
						 
					 
					
						
						
							
							NexentaStor iSCSI volume driver  
						
						... 
						
						
						
						This a NexentaStor iSCSI volume driver.
Now implemented only following functions:
  * create volume
  * delete volume
Currently delete volume still in progress.
Signed-off-by: Edison Su <sudison@gmail.com> 
						
						
					 
					
						2014-01-15 15:12:48 -08:00 
						 
				 
			
				
					
						
							
							
								Mike Tutkowski 
							
						 
					 
					
						
						
						
						
							
						
						
							68fda5a8dd 
							
						 
					 
					
						
						
							
							Merge from 4.3: CLOUDSTACK-4810: Enable hypervisor snapshots for CloudStack-managed storage (for XenServer and VMware)  
						
						
						
						
					 
					
						2014-01-09 23:36:36 -07:00 
						 
				 
			
				
					
						
							
							
								Mike Tutkowski 
							
						 
					 
					
						
						
						
						
							
						
						
							ae35782ccd 
							
						 
					 
					
						
						
							
							Merge from 4.3: CLOUDSTACK-5662: XenServer can't discover iSCSI targets with different credentials  
						
						
						
						
					 
					
						2014-01-09 21:36:34 -07:00 
						 
				 
			
				
					
						
							
							
								Mike Tutkowski 
							
						 
					 
					
						
						
						
						
							
						
						
							8b6e89c012 
							
						 
					 
					
						
						
							
							Merge from 4.3: CLOUDSTACK-4810: Enable hypervisor snapshots for CloudStack-managed storage (for XenServer and VMware)  
						
						
						
						
					 
					
						2014-01-09 15:44:02 -07:00 
						 
				 
			
				
					
						
							
							
								Mike Tutkowski 
							
						 
					 
					
						
						
						
						
							
						
						
							a298f6fce9 
							
						 
					 
					
						
						
							
							Merge from 4.3: CLOUDSTACK-5468: Configuration property should be optional  
						
						
						
						
					 
					
						2014-01-09 15:16:18 -07:00 
						 
				 
			
				
					
						
							
							
								Mike Tutkowski 
							
						 
					 
					
						
						
						
						
							
						
						
							03118c2969 
							
						 
					 
					
						
						
							
							Merge from 4.3: CLOUDSTACK-4810: Enable hypervisor snapshots for CloudStack-managed storage (for XenServer and VMware)  
						
						
						
						
					 
					
						2014-01-09 14:44:35 -07:00 
						 
				 
			
				
					
						
							
							
								Sanjay Tripathi 
							
						 
					 
					
						
						
						
						
							
						
						
							46c6b91832 
							
						 
					 
					
						
						
							
							CLOUDSTACK-4402: [deleteStoragePool] There is no way to delete Primary storage if the last host with which it was associated is already removed.  
						
						
						
						
					 
					
						2013-12-27 17:12:38 +05:30 
						 
				 
			
				
					
						
							
							
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							0824c78761 
							
						 
					 
					
						
						
							
							CLOUDSTACK-4939 - Failed to create snapshot (KVM, Multiple hosts, Sharedstorage)  
						
						... 
						
						
						
						Conflicts:
	engine/storage/datamotion/src/org/apache/cloudstack/storage/motion/AncientDataMotionStrategy.java
	engine/storage/src/org/apache/cloudstack/storage/endpoint/DefaultEndPointSelector.java
	plugins/storage/volume/default/src/org/apache/cloudstack/storage/datastore/driver/CloudStackPrimaryDataStoreDriverImpl.java
Conflicts:
	engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeObject.java
	plugins/storage/volume/default/src/org/apache/cloudstack/storage/datastore/driver/CloudStackPrimaryDataStoreDriverImpl.java 
						
						
					 
					
						2013-12-19 14:17:30 -08:00 
						 
				 
			
				
					
						
							
							
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							be5e5cc641 
							
						 
					 
					
						
						
							
							All Checkstyle problems corrected  
						
						
						
						
					 
					
						2013-12-12 12:26:07 -08:00 
						 
				 
			
				
					
						
							
							
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							bd6f706b72 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5261: added support for Alert publishing via ROOT Admin API  
						
						... 
						
						
						
						Conflicts:
	engine/orchestration/src/com/cloud/agent/manager/AgentManagerImpl.java
	engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
	engine/storage/image/src/org/apache/cloudstack/storage/image/TemplateServiceImpl.java
	engine/storage/volume/src/org/apache/cloudstack/storage/datastore/provider/DefaultHostListener.java
	engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java
	plugins/hypervisors/hyperv/src/com/cloud/hypervisor/hyperv/discoverer/HypervServerDiscoverer.java
	plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareServerDiscoverer.java
	plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java
	server/src/com/cloud/alert/AlertManagerImpl.java
	server/src/com/cloud/alert/ConsoleProxyAlertAdapter.java
	server/src/com/cloud/alert/SecondaryStorageVmAlertAdapter.java
	server/src/com/cloud/configuration/ConfigurationManagerImpl.java
	server/src/com/cloud/ha/HighAvailabilityManagerExtImpl.java
	server/src/com/cloud/ha/HighAvailabilityManagerImpl.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
	server/src/com/cloud/resourcelimit/ResourceLimitManagerImpl.java
	server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java
	server/src/com/cloud/vm/UserVmManagerImpl.java
	usage/src/com/cloud/usage/UsageAlertManagerImpl.java
	usage/src/com/cloud/usage/UsageManagerImpl.java
listAlerts: introduced new parameter "name" to the alertResponse
Conflicts:
	api/src/org/apache/cloudstack/api/command/admin/resource/ListAlertsCmd.java
	server/src/com/cloud/alert/AlertManagerImpl.java
	usage/src/com/cloud/usage/UsageAlertManagerImpl.java
Added new Admin API - generateAlert. Available to ROOT admin only
Conflicts:
	api/src/org/apache/cloudstack/alert/AlertService.java
	api/src/org/apache/cloudstack/api/BaseCmd.java
	usage/src/com/cloud/usage/UsageAlertManagerImpl.java
listAlerts: implemented search by alert name
Conflicts:
	api/src/org/apache/cloudstack/alert/AlertService.java
	api/src/org/apache/cloudstack/api/command/admin/resource/ListAlertsCmd.java
	engine/schema/src/com/cloud/alert/AlertVO.java 
						
						
					 
					
						2013-12-04 10:05:46 -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 
							
						 
					 
					
						
						
						
						
							
						
						
							224f479974 
							
						 
					 
					
						
						
							
							Removed trailing spaces  
						
						
						
						
					 
					
						2013-11-21 04:08:01 -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