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 
						 
				 
			
				
					
						
							
							
								Mike Tutkowski 
							
						 
					 
					
						
						
						
						
							
						
						
							57dacf99a2 
							
						 
					 
					
						
						
							
							Changed "boolean connectVolumeToHost(VolumeInfo, Host, DataStore)" to "boolean grantAccess(DataObject, Host, DataStore)"  
						
						... 
						
						
						
						Changed "void disconnectVolumeFromHost(VolumeInfo, Host, DataStore)" to "void revokeAccess(DataObject, Host, DataStore)" 
						
						
					 
					
						2014-10-21 16:01:14 -06:00 
						 
				 
			
				
					
						
							
							
								Mike Tutkowski 
							
						 
					 
					
						
						
						
						
							
						
						
							0cea0346ae 
							
						 
					 
					
						
						
							
							Support for back-end snapshots on primary storage  
						
						
						
						
					 
					
						2014-10-21 16:01:14 -06:00 
						 
				 
			
				
					
						
							
							
								Mike Tutkowski 
							
						 
					 
					
						
						
						
						
							
						
						
							06f6b00cd1 
							
						 
					 
					
						
						
							
							Snapshot support  
						
						
						
						
					 
					
						2014-10-21 16:01:13 -06:00 
						 
				 
			
				
					
						
							
							
								Mike Tutkowski 
							
						 
					 
					
						
						
						
						
							
						
						
							35a8b70799 
							
						 
					 
					
						
						
							
							Adding a snapshot strategy for systems that want to take snapshots that reside on their own system (as opposed to the default approach of taking a hypervisor snapshot and then copying it to secondary storage)  
						
						
						
						
					 
					
						2014-10-14 12:26:40 -06: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 
						 
				 
			
				
					
						
							
							
								Likitha Shetty 
							
						 
					 
					
						
						
						
						
							
						
						
							f1e3e83bbf 
							
						 
					 
					
						
						
							
							BUG-ID: CLOUDSTACK-7653. VM's are not getting deleted from hypervisor after deleting from UI when using zone wide primary storage.  
						
						... 
						
						
						
						While expunging a volume, CS chooses the endpoint to perform delete operation by selecting any host that has the storage containing the volume mounted on it.
Instead, if the volume to be deleted is attached to a VM, the endpoint chosen by CCP should be the host that contains the VM. 
						
						
					 
					
						2014-09-30 15:20:15 +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 
						 
				 
			
				
					
						
							
							
								Mike Tutkowski 
							
						 
					 
					
						
						
						
						
							
						
						
							b080eaf327 
							
						 
					 
					
						
						
							
							Updates to the way resizing a volume works  
						
						
						
						
					 
					
						2014-07-17 21:09:19 -06:00 
						 
				 
			
				
					
						
							
							
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							cd0ef09344 
							
						 
					 
					
						
						
							
							Fix typo and add the right exception to the error map.  
						
						
						
						
					 
					
						2014-06-25 15:51:28 +02:00 
						 
				 
			
				
					
						
							
							
								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 
						 
				 
			
				
					
						
							
							
								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 
						 
				 
			
				
					
						
							
							
								Devdeep Singh 
							
						 
					 
					
						
						
						
						
							
						
						
							245b7f4c39 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6510: Fix gson serialization exception in storage migration. Gson couldn't serialize  
						
						... 
						
						
						
						a map with volume and storagepool objects for logging. Fixed by using volume and storage pool
ids instead of objects in the map. 
						
						
					 
					
						2014-05-08 12:23:46 +05:30 
						 
				 
			
				
					
						
							
							
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							3a889aa217 
							
						 
					 
					
						
						
							
							CLOUDSTACK-3886: Volume attach/detach implementation for ROOT disk  
						
						... 
						
						
						
						Implemented for Xen hypervisor only by now
Unittests are included 
						
						
					 
					
						2014-04-03 11:39:56 -07:00 
						 
				 
			
				
					
						
							
							
								Mike Tutkowski 
							
						 
					 
					
						
						
						
						
							
						
						
							1577e75a3d 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6170 (VMware root-disk support for managed storage)  
						
						
						
						
					 
					
						2014-03-31 00:13:30 -06:00 
						 
				 
			
				
					
						
							
							
								Daan Hoogland 
							
						 
					 
					
						
						
						
						
							
						
						
							8b62b2cb92 
							
						 
					 
					
						
						
							
							findbugs: exclude known spiffy hacks a.k.a. false positives  
						
						
						
						
					 
					
						2014-03-28 14:28:10 +01:00 
						 
				 
			
				
					
						
							
							
								Mike Tutkowski 
							
						 
					 
					
						
						
						
						
							
						
						
							7629d6f129 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6170  
						
						
						
						
					 
					
						2014-03-20 23:54:53 -06:00 
						 
				 
			
				
					
						
							
							
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							a1831bc864 
							
						 
					 
					
						
						
							
							Revert "CLOUDSTACK-6170" due to unit test failure.  
						
						... 
						
						
						
						This reverts commit 50b5e2e247ebff54fda8c8c2cd4957ffd47bcf12. 
						
						
					 
					
						2014-03-20 16:40:45 -07:00 
						 
				 
			
				
					
						
							
							
								Mike Tutkowski 
							
						 
					 
					
						
						
						
						
							
						
						
							50b5e2e247 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6170  
						
						
						
						
					 
					
						2014-03-20 16:52:52 -06:00 
						 
				 
			
				
					
						
							
							
								Nitin Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							7442b56fa8 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6247: Usage Events - hide them when display flag is off in the context of "Ability to have better control over first class objects in CS" feature  
						
						... 
						
						
						
						And when the flag is updated on the resource accordingly generate usage events again.
Also when display flag is false in deployvm cmd it should be false for the volumes associated with the vm as well 
						
						
					 
					
						2014-03-18 14:00:25 -07:00 
						 
				 
			
				
					
						
							
							
								edison 
							
						 
					 
					
						
						
						
						
							
						
						
							ed9ed446c2 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5432: potential bugs in case of stop mgt server while  
						
						... 
						
						
						
						template is downloading, template_store_ref has leftover not in ready
state, when create vm from that template, the code doesn't check either
zone id, nor template_store_ref state.
Conflicts:
	engine/orchestration/src/org/apache/cloudstack/engine/orchestration/VolumeOrchestrator.java 
						
						
					 
					
						2014-03-18 12:20:14 +01:00 
						 
				 
			
				
					
						
							
							
								Mike Tutkowski 
							
						 
					 
					
						
						
						
						
							
						
						
							d55c4dd804 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6170  
						
						
						
						
					 
					
						2014-03-14 23:47:20 -06:00 
						 
				 
			
				
					
						
							
							
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							4402685e11 
							
						 
					 
					
						
						
							
							Update master to 4.5.0-SNAPSHOT  
						
						
						
						
					 
					
						2014-03-14 14:55:26 +01:00 
						 
				 
			
				
					
						
							
							
								Devdeep Singh 
							
						 
					 
					
						
						
						
						
							
						
						
							2aff39f8c7 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6143: Storage motion support for hyper-v. With these changes a volume on a shared  
						
						... 
						
						
						
						storage pool (SMB) and attached to a running vm can be live migrated to another shared storage
pool. Also a vm and its volumes can be live migrated to another host and storage pool respectively. 
						
						
					 
					
						2014-03-14 16:27:58 +05:30 
						 
				 
			
				
					
						
							
							
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							1b83698dac 
							
						 
					 
					
						
						
							
							deployVm/startVm APIs: ability to define deploymentPlanner for VmToStart in the api call (available to ROOT admin only)  
						
						
						
						
					 
					
						2014-03-13 10:23:34 -07:00 
						 
				 
			
				
					
						
							
							
								Mike Tutkowski 
							
						 
					 
					
						
						
						
						
							
						
						
							c427e8db1c 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6170  
						
						
						
						
					 
					
						2014-03-07 15:38:50 -07:00 
						 
				 
			
				
					
						
							
							
								Mike Tutkowski 
							
						 
					 
					
						
						
						
						
							
						
						
							b06e66c50a 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6170  
						
						
						
						
					 
					
						2014-03-05 13:55:12 -07:00 
						 
				 
			
				
					
						
							
							
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							5a8d165afa 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6198: use List DS for storing NicProfiles as public network can have more than one nic  
						
						... 
						
						
						
						Conflicts:
	engine/api/src/com/cloud/vm/VirtualMachineManager.java
	engine/api/src/org/apache/cloudstack/engine/orchestration/service/NetworkOrchestrationService.java
	engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
	engine/orchestration/src/org/apache/cloudstack/engine/orchestration/CloudOrchestrator.java
	engine/orchestration/src/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java
	plugins/network-elements/elastic-loadbalancer/src/com/cloud/network/lb/ElasticLoadBalancerManagerImpl.java
	plugins/network-elements/internal-loadbalancer/src/org/apache/cloudstack/network/lb/InternalLoadBalancerVMManagerImpl.java
	plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/management/ServiceManagerImpl.java
	server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
	server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
	server/test/com/cloud/vpc/MockNetworkManagerImpl.java
	services/secondary-storage/controller/src/org/apache/cloudstack/secondarystorage/SecondaryStorageManagerImpl.java 
						
						
					 
					
						2014-03-04 15:37:52 -08:00 
						 
				 
			
				
					
						
							
							
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							fa7d9ad1a8 
							
						 
					 
					
						
						
							
							VirtualMachineManager.migrateAway() need to put under management of new sync model  
						
						
						
						
					 
					
						2014-02-28 15:35:58 -08:00 
						 
				 
			
				
					
						
							
							
								wrodrigues 
							
						 
					 
					
						
						
						
						
							
						
						
							f414018a60 
							
						 
					 
					
						
						
							
							adding fix and unit tests for cloud-engine-api scariest  
						
						... 
						
						
						
						Signed-off-by: Hugo Trippaers <htrippaers@schubergphilis.com> 
						
						
					 
					
						2014-02-14 18:37:44 +01:00 
						 
				 
			
				
					
						
							
							
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							bac2c1e5b4 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6049: Give priority to cache stores where data object is  
						
						... 
						
						
						
						already there instead of randomly picking one in case there are multiple
cache stores in the scope. 
						
						
					 
					
						2014-02-06 17:19:24 -08:00 
						 
				 
			
				
					
						
							
							
								Murali Reddy 
							
						 
					 
					
						
						
						
						
							
						
						
							af657b3d71 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5861: networks that failed to implement can not be destroyed  
						
						... 
						
						
						
						introduces a force option in delete network to forcifully delete a
network. This comes handy in rare cases where network fails to implenet
and network is in shutdown state, but network shutdown to rollback
implement process fails as well.
Conflicts:
	api/src/org/apache/cloudstack/api/command/user/network/DeleteNetworkCmd.java
	server/src/com/cloud/user/DomainManagerImpl.java 
						
						
					 
					
						2014-01-13 23:28:35 +05:30 
						 
				 
			
				
					
						
							
							
								Mike Tutkowski 
							
						 
					 
					
						
						
						
						
							
						
						
							7ef78aac40 
							
						 
					 
					
						
						
							
							Merge from 4.3: CLOUDSTACK-5662: XenServer can't discover iSCSI targets with different credentials  
						
						
						
						
					 
					
						2014-01-09 22:37:39 -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 
						 
				 
			
				
					
						
							
							
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							1e2e1ea051 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5765: cleanup internal serialization and exception propagation issues  
						
						
						
						
					 
					
						2014-01-09 14:29:13 -08: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 
						 
				 
			
				
					
						
							
							
								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 
						 
				 
			
				
					
						
							
							
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							647ea6e2d0 
							
						 
					 
					
						
						
							
							listNics API: added optional networkId parameter allowing to list nics by network id for the specific vm  
						
						
						
						
					 
					
						2014-01-06 17:09:14 -08:00 
						 
				 
			
				
					
						
							
							
								Bharat Kumar 
							
						 
					 
					
						
						
						
						
							
						
						
							17023c0d60 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5750 Make default value of execute.in.sequence.hypervisor.commands false.  
						
						... 
						
						
						
						Conflicts:
	engine/api/src/com/cloud/vm/VirtualMachineManager.java 
						
						
					 
					
						2014-01-06 18:43:23 +05:30 
						 
				 
			
				
					
						
							
							
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							6f800506fd 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5653:S3 object store as Secondary Storage, the template  
						
						... 
						
						
						
						created from different zone is not available for the other zones. 
						
						
					 
					
						2013-12-26 14:48:21 -08:00 
						 
				 
			
				
					
						
							
							
								Nitin Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							edc1b78d84 
							
						 
					 
					
						
						
							
							Revert "Revert "CLOUDSTACK-5281:""  
						
						... 
						
						
						
						This reverts commit ab37009e9015e90f39f001dbc7023ce52319dcff. 
						
						
					 
					
						2013-12-20 17:30:05 -08:00 
						 
				 
			
				
					
						
							
							
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							ab37009e90 
							
						 
					 
					
						
						
							
							Revert "CLOUDSTACK-5281:"  
						
						... 
						
						
						
						This reverts commit 6b62a04eaf1196ebcce5e81c29c9e0f59dd4f858. 
						
						
					 
					
						2013-12-20 17:23:33 -08:00 
						 
				 
			
				
					
						
							
							
								Nitin Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							6b62a04eaf 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5281:  
						
						... 
						
						
						
						Resource limit shouldnt be counted for resources with display flag = 0. Correcting this for the networks at the moment. 
						
						
					 
					
						2013-12-20 16:58:43 -08:00 
						 
				 
			
				
					
						
							
							
								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 
						 
				 
			
				
					
						
							
							
								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 
						 
				 
			
				
					
						
							
							
								Harikrishna Patnala 
							
						 
					 
					
						
						
						
						
							
						
						
							707da55fe3 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5554: Custom disk offering allows to create a datadisk with size greater than custom.diskoffering.size.max value Fixed both custom.diskoffering.size.max and custom.diskoffering.size.min to ensure input values while deploying the VM and creating volume APIs.  
						
						... 
						
						
						
						Moved both parameters to VolumeOrchestrationService using ConfigDepot 
						
						
					 
					
						2013-12-19 16:03:27 +05:30 
						 
				 
			
				
					
						
							
							
								Nitin Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							1c0b8db01b 
							
						 
					 
					
						
						
							
							CLOUDSTACK-4941:  
						
						... 
						
						
						
						Adding the missing file
During HA and maintenance call different planners (if the original planners are not able to find capacity) which skip some heurestics 
						
						
					 
					
						2013-12-18 16:27:20 -08:00 
						 
				 
			
				
					
						
							
							
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							afcf967d24 
							
						 
					 
					
						
						
							
							Revert "CLOUDSTACK-4941:"  
						
						... 
						
						
						
						This reverts commit 231e7c01f2415c1f25d6a2715b7469fe7fcfe771. 
						
						
					 
					
						2013-12-18 16:01:37 -08:00 
						 
				 
			
				
					
						
							
							
								Nitin Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							231e7c01f2 
							
						 
					 
					
						
						
							
							CLOUDSTACK-4941:  
						
						... 
						
						
						
						During HA and maintenance call different planners (if the original planners are not able to find capacity) which skip some heurestics 
						
						
					 
					
						2013-12-18 14:58:37 -08:00