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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							719271b1d9 
							
						 
					 
					
						
						
							
							Fix tab and trailing spaces  
						
						 
						
						
						
						
					 
					
						2013-12-16 15:15:30 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							9d3827e6fe 
							
						 
					 
					
						
						
							
							CLOUDSTACK-669: refactor VM work job dispatcher to allow volume/snapshot manager to participate serialized job handling  
						
						 
						
						
						
						
					 
					
						2013-12-16 15:15:30 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							be5e5cc641 
							
						 
					 
					
						
						
							
							All Checkstyle problems corrected  
						
						 
						
						
						
						
					 
					
						2013-12-12 12:26:07 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Prachi Damle 
							
						 
					 
					
						
						
						
						
							
						
						
							5475312612 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5399: Add option to createVolume API to specify a VM, to place the volume appropriately and attach immediately  
						
						 
						
						... 
						
						
						
						Changes:
    - Added 'virtualmachineid' parameter to the createVolume API to specify a VM for the volume. The Vm should be in 'Running' or 'Stopped' state.
    - This parameter is used only when createVolume API is called using snapshotid parameter
    - When this parameter is set, the volume is created from the snapshot in the pod/cluster of the VM. Also the volume is then attached to the VM in the same request
    - If attach Volume fails but create has succeeded, the API errors out but the Volume created remains available. User may attach the same volume later
    - When Vm is provided, but if no storage pool is available in the VM's pod/cluster then the volume is not created and API fails. 
						
						
					 
					
						2013-12-06 11:18:26 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Ough 
							
						 
					 
					
						
						
						
						
							
						
						
							88f64b2b93 
							
						 
					 
					
						
						
							
							Changed 'MigrateCommand' to use the global setting value of 'execute.in.sequence.hypervisor.commands'  
						
						 
						
						... 
						
						
						
						Signed-off-by: Koushik Das <koushik@apache.org> 
						
						
					 
					
						2013-12-06 09:41:50 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Bharat Kumar 
							
						 
					 
					
						
						
						
						
							
						
						
							68406ba29d 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5161 enable scaling of a vm using custom offering  
						
						 
						
						... 
						
						
						
						Signed-off-by: Koushik Das <koushik@apache.org> 
						
						
					 
					
						2013-11-29 17:53:33 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							278ef81a83 
							
						 
					 
					
						
						
							
							side-by-side VM sync management at manager level  
						
						 
						
						
						
						
					 
					
						2013-11-20 17:59:38 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Wido den Hollander 
							
						 
					 
					
						
						
						
						
							
						
						
							1edaa36cc6 
							
						 
					 
					
						
						
							
							CLOUDSTACK-1302: Allow a cache mode per disk offering  
						
						 
						
						... 
						
						
						
						Per disk offering the setting none, writeback or writethrough can be set
This allows for both safety and performance for writes. 
						
						
					 
					
						2013-11-20 17:11:10 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							8d62744681 
							
						 
					 
					
						
						
							
							Reformat all source code.  Added checkstyle to check the source code  
						
						 
						
						
						
						
					 
					
						2013-11-20 07:26:53 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							465626f6d1 
							
						 
					 
					
						
						
							
							Fixed issues with execute in sequence  
						
						 
						
						
						
						
					 
					
						2013-11-19 17:20:58 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							bb8f8fb20b 
							
						 
					 
					
						
						
							
							Expose getPrimaryDataStore(String uuid) through the DatastoreManager interface so it can be used clients.  
						
						 
						
						
						
						
					 
					
						2013-11-18 14:27:06 +01: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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Rajesh Battala 
							
						 
					 
					
						
						
						
						
							
						
						
							19e9849d86 
							
						 
					 
					
						
						
							
							Enabled the traffic lable support the hyperv hypervisor type. Modified the physical_network_traffic_types table to introduce hyperv_network lable column.  
						
						 
						
						... 
						
						
						
						Modified associated VO's and impls classes. Modified the List/Update/Add TrafficType command api's and response classes.
Fixed the Unit tests 
						
						
					 
					
						2013-11-08 20:21:18 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							c233492bfc 
							
						 
					 
					
						
						
							
							Add quiencevm option on createsnapshotcmd  
						
						 
						
						
						
						
					 
					
						2013-11-07 14:57:05 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Laszlo Hornyak 
							
						 
					 
					
						
						
						
						
							
						
						
							465dee0159 
							
						 
					 
					
						
						
							
							Removing coded documentation  
						
						 
						
						... 
						
						
						
						This is the output of the program, the developer documentation may be a better place
-----
When developing against the CloudStack Orchestration Platform, you must following the following rules:
API Rule: Always be prepared to handle RuntimeExceptions.
When writing APIs, you must follow these rules:
API Rule: You may think you're the greatest developer in the world but every change to the API must be reviewed and approved.
API Rule: Every API must have unit tests written against it.  And not it's unit tests
API Rule:
-----
Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com> 
						
						
					 
					
						2013-11-07 21:18:52 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Laszlo Hornyak 
							
						 
					 
					
						
						
						
						
							
						
						
							336eb48f9b 
							
						 
					 
					
						
						
							
							fixed Rules  
						
						 
						
						... 
						
						
						
						it was no longer working, it must be fixed for those who want to read it.
Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com> 
						
						
					 
					
						2013-11-07 21:18:52 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Bharat Kumar 
							
						 
					 
					
						
						
						
						
							
						
						
							7095ea2b5e 
							
						 
					 
					
						
						
							
							CLOUDSTACK-4738 Dynamic compute offering.  
						
						 
						
						... 
						
						
						
						Signed-off-by: Koushik Das <koushik@apache.org> 
						
						
					 
					
						2013-11-07 12:41:20 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							191dc80fa4 
							
						 
					 
					
						
						
							
							VM power state for job oritented sync processing  
						
						 
						
						
						
						
					 
					
						2013-11-05 19:00:37 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Prachi Damle 
							
						 
					 
					
						
						
						
						
							
						
						
							4be7947281 
							
						 
					 
					
						
						
							
							CLOUDSTACK-4948: DeploymentPlanner: Logic to check if cluster can be avoided, needs to consider if VM is using local storage and/or shared storage  
						
						 
						
						... 
						
						
						
						Changes:
- Consider if VM requires the local storage or shared storage or both for its disks.
- Accordingly all pools in the cluster should consider local or shared or both pools
Conflicts:
	server/src/com/cloud/agent/manager/allocator/HostAllocator.java 
						
						
					 
					
						2013-11-04 16:45:02 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							7c99b88926 
							
						 
					 
					
						
						
							
							Don't use cast to PrimarydataStoreTO on the resource code  
						
						 
						
						
						
						
					 
					
						2013-11-01 15:13:16 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							c5bec6b336 
							
						 
					 
					
						
						
							
							add quiescevm in createvmsnapshotcmd  
						
						 
						
						
						
						
					 
					
						2013-10-31 16:45:05 -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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							70b2c0150d 
							
						 
					 
					
						
						
							
							rebase to spring changes  
						
						 
						
						
						
						
					 
					
						2013-10-25 18:15:36 -07:00