Sanjay Tripathi 
							
						 
					 
					
						
						
						
						
							
						
						
							466e6d15a4 
							
						 
					 
					
						
						
							
							CLOUDSTACK-8097: Failed to create volume snapshot after vm live migration across clusters.  
						
						... 
						
						
						
						(cherry picked from commit 0c4128e024b519f24625ad8cd6b53ddf0137728e)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com> 
						
						
					 
					
						2015-01-18 17:59:31 +05:30 
						 
				 
			
				
					
						
							
							
								Sanjay Tripathi 
							
						 
					 
					
						
						
						
						
							
						
						
							8676ff26e0 
							
						 
					 
					
						
						
							
							CLOUDSTACK-8066: There is not way to know the size of the snapshot created.  
						
						... 
						
						
						
						(cherry picked from commit 9153b8bede3350750cb7a78891e0479cc72aa2ec)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com> 
						
						
					 
					
						2015-01-18 17:25:41 +05:30 
						 
				 
			
				
					
						
							
							
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							bd79965329 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7947:  
						
						... 
						
						
						
						double check if parent snapshot is removed or not, when creating new
snapshot
Reviewed-by: Min 
						
						
					 
					
						2014-11-19 16:12:28 -08:00 
						 
				 
			
				
					
						
							
							
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							d856a2acad 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7946:  
						
						... 
						
						
						
						remove leftover state in volume and snapshot table in case of mgt server
shutdown during storage operation.
Reviewed-by: Min 
						
						
					 
					
						2014-11-19 16:08:27 -08:00 
						 
				 
			
				
					
						
							
							
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							5018db8b62 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7945:  
						
						... 
						
						
						
						set removed field in snapshots table in case of snaphsot failure.
Reviewed-by: Frank 
						
						
					 
					
						2014-11-19 15:58:07 -08:00 
						 
				 
			
				
					
						
							
							
								Sanjay Tripathi 
							
						 
					 
					
						
						
						
						
							
						
						
							5a67fe7369 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7842: wrong size column is getting updated with snapshot physical size in snapshot_store_ref table.  
						
						... 
						
						
						
						Also fixed the issue that snapshot size with hypervisor XS >= 6.2.5 is not getting updated in snapshot_store_ref table. 
						
						
					 
					
						2014-11-05 16:44:54 +05:30 
						 
				 
			
				
					
						
							
							
								Mike Tutkowski 
							
						 
					 
					
						
						
						
						
							
						
						
							1d2f3300ad 
							
						 
					 
					
						
						
							
							Adding support for SolidFire snapshots  
						
						
						
						
					 
					
						2014-09-03 20:09:00 -06:00 
						 
				 
			
				
					
						
							
							
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							dc3f0cbc63 
							
						 
					 
					
						
						
							
							Improve the handling of the findbug exclude files  
						
						
						
						
					 
					
						2014-09-03 10:41:22 +02:00 
						 
				 
			
				
					
						
							
							
								Anthony Xu 
							
						 
					 
					
						
						
						
						
							
						
						
							90fe6d8087 
							
						 
					 
					
						
						
							
							removed trailing space  
						
						
						
						
					 
					
						2014-08-13 11:09:38 -07:00 
						 
				 
			
				
					
						
							
							
								Anthony Xu 
							
						 
					 
					
						
						
						
						
							
						
						
							330c4ba578 
							
						 
					 
					
						
						
							
							completed the new vmsync TODOs in the code.  
						
						... 
						
						
						
						removed old vmsync logic 
						
						
					 
					
						2014-07-28 12:51:37 -07:00 
						 
				 
			
				
					
						
							
							
								amoghvk 
							
						 
					 
					
						
						
						
						
							
						
						
							33d6bc278f 
							
						 
					 
					
						
						
							
							Adding missing modified file  
						
						
						
						
					 
					
						2014-07-14 17:42:27 -07:00 
						 
				 
			
				
					
						
							
							
								amoghvk 
							
						 
					 
					
						
						
						
						
							
						
						
							62e63a1bf7 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6358: Missing patches in master for VMware  
						
						
						
						
					 
					
						2014-07-14 16:54:10 -07:00 
						 
				 
			
				
					
						
							
							
								amoghvk 
							
						 
					 
					
						
						
						
						
							
						
						
							6831ed4026 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6358: Missing patches in master branch  
						
						
						
						
					 
					
						2014-07-14 15:17:58 -07:00 
						 
				 
			
				
					
						
							
							
								Daan Hoogland 
							
						 
					 
					
						
						
						
						
							
						
						
							c79ab570b0 
							
						 
					 
					
						
						
							
							Revert "CLOUDSTACK-6967: Initial OVM3 drop"  
						
						... 
						
						
						
						This reverts commit 8a485b9b59e4108e862022baf7477f768380b325. 
						
						
					 
					
						2014-06-24 10:24:01 +02:00 
						 
				 
			
				
					
						
							
							
								Funs 
							
						 
					 
					
						
						
						
						
							
						
						
							8a485b9b59 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6967: Initial OVM3 drop  
						
						... 
						
						
						
						Signed-off-by: Sebastien Goasguen <runseb@gmail.com>
(cherry picked from commit ed47763e2525a21fa4578d199492462d0fb1c7ef)
Conflicts:
	api/src/com/cloud/network/NetworkService.java
	api/src/org/apache/cloudstack/api/ApiConstants.java
	api/src/org/apache/cloudstack/api/command/admin/usage/AddTrafficTypeCmd.java
	engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/SnapshotObject.java
	plugins/pom.xml
	server/src/com/cloud/network/NetworkServiceImpl.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
	server/test/com/cloud/vpc/MockNetworkManagerImpl.java
	ui/scripts/docs.js 
						
						
					 
					
						2014-06-23 12:39:10 +02:00 
						 
				 
			
				
					
						
							
							
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							e656201fee 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5395: mark snapshot_store_ref as destroyed in case of backup snapshot failed  
						
						... 
						
						
						
						Conflicts:
	plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServerStorageProcessor.java 
						
						
					 
					
						2014-03-28 16:21:22 -07:00 
						 
				 
			
				
					
						
							
							
								Daan Hoogland 
							
						 
					 
					
						
						
						
						
							
						
						
							8b62b2cb92 
							
						 
					 
					
						
						
							
							findbugs: exclude known spiffy hacks a.k.a. false positives  
						
						
						
						
					 
					
						2014-03-28 14:28:10 +01:00 
						 
				 
			
				
					
						
							
							
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							ae1d6a771b 
							
						 
					 
					
						
						
							
							Remove IAMEntityType to use existing VO interface class to annotate  
						
						... 
						
						
						
						entityType. 
						
						
					 
					
						2014-03-17 17:19:55 -07:00 
						 
				 
			
				
					
						
							
							
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							4402685e11 
							
						 
					 
					
						
						
							
							Update master to 4.5.0-SNAPSHOT  
						
						
						
						
					 
					
						2014-03-14 14:55:26 +01:00 
						 
				 
			
				
					
						
							
							
								Prachi Damle 
							
						 
					 
					
						
						
						
						
							
						
						
							f41604fc6c 
							
						 
					 
					
						
						
							
							Renaming AclEntityType --> IAMEntityType  
						
						
						
						
					 
					
						2014-02-25 16:43:17 -08:00 
						 
				 
			
				
					
						
							
							
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							3b58a45e04 
							
						 
					 
					
						
						
							
							Merge branch 'master' into rbac.  
						
						
						
						
					 
					
						2014-02-07 13:43:36 -08:00 
						 
				 
			
				
					
						
							
							
								Nitin Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							86cada3b3c 
							
						 
					 
					
						
						
							
							CLOUDSTACK-2932:  
						
						... 
						
						
						
						Allow deleting of snapshots that have errored out. Simply mark the removed column as there is no physical clean up required. It can land into error state only from allocated/Creating state
 which are states before creation on primary storage works 
						
						
					 
					
						2014-02-05 17:34:48 -08:00 
						 
				 
			
				
					
						
							
							
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							9b21da65d1 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6025:CreateTemplate from snapshot in NFS is failing , after  
						
						... 
						
						
						
						migarting to S3 datastore. 
						
						
					 
					
						2014-02-04 11:01:51 -08:00 
						 
				 
			
				
					
						
							
							
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							b35eb04de3 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6017: NPE while creating snapshot multiple times on same Root  
						
						... 
						
						
						
						volume with S3 as secondary storage. 
						
						
					 
					
						2014-02-03 12:16:19 -08:00 
						 
				 
			
				
					
						
							
							
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							929fbabaa2 
							
						 
					 
					
						
						
							
							Merge branch 'master' into rbac.  
						
						
						
						
					 
					
						2014-01-17 14:37:08 -08:00 
						 
				 
			
				
					
						
							
							
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							3223028fd6 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5841:Snapshots taken before migration NFS to S3 can not be  
						
						... 
						
						
						
						used cross-zone. 
						
						
					 
					
						2014-01-08 17:43:06 -08:00 
						 
				 
			
				
					
						
							
							
								Sanjay Tripathi 
							
						 
					 
					
						
						
						
						
							
						
						
							3ad0e8fb47 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5701: physical size is not getting updated in snapshot_store_ref table.  
						
						
						
						
					 
					
						2014-01-06 11:36:43 +05:30 
						 
				 
			
				
					
						
							
							
								Likitha Shetty 
							
						 
					 
					
						
						
						
						
							
						
						
							e659751a8a 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5508. Vmware - When there are multiple secondary stores, the newly added secondary store is not being selected for backing up snapshots.  
						
						... 
						
						
						
						If the snapshot being backed up is a a delta snapshot, pick the image store where the parent snapshot is stored. Otheriwse pick a random image store. 
						
						
					 
					
						2013-12-24 17:34:19 +05:30 
						 
				 
			
				
					
						
							
							
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							8caf52c6bc 
							
						 
					 
					
						
						
							
							add xenserver 6.2.0 hotfix support, to optimize vdi copy  
						
						... 
						
						
						
						add xenserver hot fix
Conflicts:
	api/src/com/cloud/vm/VirtualMachineName.java
	core/src/com/cloud/host/HostInfo.java
	core/src/org/apache/cloudstack/storage/to/SnapshotObjectTO.java
	deps/XenServerJava/src/com/xensource/xenapi/VDI.java
	engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/XenserverSnapshotStrategy.java
	engine/storage/src/org/apache/cloudstack/storage/endpoint/DefaultEndPointSelector.java
	engine/storage/src/org/apache/cloudstack/storage/image/db/SnapshotDataStoreDaoImpl.java
	plugins/hypervisors/xen/src/com/cloud/hypervisor/XenServerGuru.java
	plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
	plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServerPoolVms.java
	plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServerStorageProcessor.java
	server/src/com/cloud/configuration/Config.java 
						
						
					 
					
						2013-12-19 14:15:41 -08:00 
						 
				 
			
				
					
						
							
							
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							46d1e1afb2 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5446:KVM-Secondary Store down-Even after secondary store is  
						
						... 
						
						
						
						brought back up after being down for few hours,snapshot jobs do not get
triggered with reason "there is other active snapshot tasks on the
instance to which the volume is attached". 
						
						
					 
					
						2013-12-13 22:04:29 -08:00 
						 
				 
			
				
					
						
							
							
								Prachi Damle 
							
						 
					 
					
						
						
						
						
							
						
						
							7c6f1c14c2 
							
						 
					 
					
						
						
							
							ControlledEntity Interface change to return EntityType and added values to the AclEntityType enum and  
						
						
						
						
					 
					
						2013-12-12 16:31:00 -08:00 
						 
				 
			
				
					
						
							
							
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							be5e5cc641 
							
						 
					 
					
						
						
							
							All Checkstyle problems corrected  
						
						
						
						
					 
					
						2013-12-12 12:26:07 -08:00 
						 
				 
			
				
					
						
							
							
								Wei Zhou 
							
						 
					 
					
						
						
						
						
							
						
						
							81c07f1791 
							
						 
					 
					
						
						
							
							allow delete snapshot with ERROR state  
						
						
						
						
					 
					
						2013-11-28 10:48:07 +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 
						 
				 
			
				
					
						
							
							
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							4815b024bf 
							
						 
					 
					
						
						
							
							Add quiesce vm for vmware during vm snapshot  
						
						
						
						
					 
					
						2013-11-08 15:47:11 -08:00 
						 
				 
			
				
					
						
							
							
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							c233492bfc 
							
						 
					 
					
						
						
							
							Add quiencevm option on createsnapshotcmd  
						
						
						
						
					 
					
						2013-11-07 14:57:05 -08:00 
						 
				 
			
				
					
						
							
							
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							918bc74050 
							
						 
					 
					
						
						
							
							fix compile  
						
						
						
						
					 
					
						2013-11-01 16:16:03 -07:00 
						 
				 
			
				
					
						
							
							
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							7c99b88926 
							
						 
					 
					
						
						
							
							Don't use cast to PrimarydataStoreTO on the resource code  
						
						
						
						
					 
					
						2013-11-01 15:13:16 -07:00 
						 
				 
			
				
					
						
							
							
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							b704d5b8d3 
							
						 
					 
					
						
						
							
							add quiesceVm vm helper function  
						
						
						
						
					 
					
						2013-10-31 16:24:48 -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 
						 
				 
			
				
					
						
							
							
								Laszlo Hornyak 
							
						 
					 
					
						
						
						
						
							
						
						
							7902315287 
							
						 
					 
					
						
						
							
							build fix  
						
						... 
						
						
						
						Failing VMSnapshotStrategyTest was missing db.properties
Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com> 
						
						
					 
					
						2013-10-26 17:34:00 +02:00 
						 
				 
			
				
					
						
							
							
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							70b2c0150d 
							
						 
					 
					
						
						
							
							rebase to spring changes  
						
						
						
						
					 
					
						2013-10-25 18:15:36 -07:00 
						 
				 
			
				
					
						
							
							
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							51a8086cf6 
							
						 
					 
					
						
						
							
							Merge branch 'pluggable_vm_snapshot'  
						
						... 
						
						
						
						Conflicts:
	client/tomcatconf/applicationContext.xml.in
	engine/storage/integration-test/test/org/apache/cloudstack/storage/test/SnapshotTest.java
	engine/storage/integration-test/test/resources/storageContext.xml
	server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java
	server/src/com/cloud/vm/snapshot/VMSnapshotManagerImpl.java 
						
						
					 
					
						2013-10-25 16:47:17 -07:00 
						 
				 
			
				
					
						
							
							
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							a6ce66e55a 
							
						 
					 
					
						
						
							
							move a lot of code into vmsnapshot strategy  
						
						... 
						
						
						
						fix compile
fix compile
add vm_snapshot_details table in db
add vmsnapshot test cases 
						
						
					 
					
						2013-10-25 15:09:04 -07:00 
						 
				 
			
				
					
						
							
							
								Darren Shepherd 
							
						 
					 
					
						
						
						
						
							
						
						
							c9101966e0 
							
						 
					 
					
						
						
							
							Added StorageStrategyFactory to centralize and deduplicate some logic  
						
						
						
						
					 
					
						2013-10-23 12:40:41 -07:00 
						 
				 
			
				
					
						
							
							
								Darren Shepherd 
							
						 
					 
					
						
						
						
						
							
						
						
							81d01369d7 
							
						 
					 
					
						
						
							
							Merge commit 'df728fcf41ba0dfddabfaadea8cbcb77d18bfa96'  
						
						... 
						
						
						
						Conflicts:
	engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java 
						
						
					 
					
						2013-10-23 12:31:53 -07:00