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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sanjay Tripathi 
							
						 
					 
					
						
						
						
						
							
						
						
							c7d31fe288 
							
						 
					 
					
						
						
							
							CLOUDSTACK-4760 : Enabling GPU support for XenServer.  
						
						 
						
						... 
						
						
						
						CLOUDSTACK-4762 : Enabling VGPU support for XenServer.
This feature is to enable the GPU-passthrough and vGPU functionality,
with the help of this feature, admins/users will be able to leverage
the GPU graphics unit power by deploying a virtul machine with GPU or
vGPU support or by changing the service offering of an existing VM
at any later point of time. There GPU/vGPU enabled VMs are able to run
graphical applications.
For now, this feature is only supported with XenServer hypervisor but
can be extended to add the support of other hypervisors. 
						
						
					 
					
						2014-03-11 15:44:51 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nitin Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							ded7e682dc 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5478: Enable publishing uuid for all the async apis in the CallContext.  
						
						 
						
						... 
						
						
						
						The advantage would be that event publishing can pick up the uuid and publish them. 
						
						
					 
					
						2014-03-07 16:50:21 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nitin Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							830328b63d 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6199:  Hide action events for Vm/Volume commands when the resources have display flag=0.  
						
						 
						
						... 
						
						
						
						Introduce generic BaseAsync(Vm/Volume)Cmd to make get the flag value for logging action events.
Rename the db field as display rather than display_event in keeping with the convention 
						
						
					 
					
						2014-03-05 16:40:44 -08: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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							d9a4e038a0 
							
						 
					 
					
						
						
							
							Enhanced updateVirtualMachine API with optional parameter "name" - to allow update hostName for the virtual machine  
						
						 
						
						
						
						
					 
					
						2014-02-28 14:35:37 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							2f7bfc0c73 
							
						 
					 
					
						
						
							
							Display flag support for publicIpAddress and VPC. Once set to false, the object is not listed to the regular user. Available to be set by Root admin only  
						
						 
						
						
						
						
					 
					
						2014-02-20 17:15:42 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Marcus Sorensen 
							
						 
					 
					
						
						
						
						
							
						
						
							df77c4310a 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6103: Pass VM iso information along with  
						
						 
						
						... 
						
						
						
						PrepareForMigrationCommand, so that destination hypervisor can
mount pool. This further exposed an issue for KVM where iso
was not getting cleaned up upon successful migration, fixed as well. 
						
						
					 
					
						2014-02-14 00:34:48 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							e0de79b170 
							
						 
					 
					
						
						
							
							Resource metadata: by default, all metadata is set with display=true (meaning that the detail is avaialble for display to the regular user). If admin wants to set a specific detail to be false, he has to specify it explicitly in addResourceDetail command  
						
						 
						
						
						
						
					 
					
						2014-02-10 12:05:59 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							6af6ce7e9e 
							
						 
					 
					
						
						
							
							1) Added External UUID control support for network.  
						
						 
						
						... 
						
						
						
						2) Moved UUIDManager interface to cloud-util package 
						
						
					 
					
						2014-02-04 15:47:12 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Likitha Shetty 
							
						 
					 
					
						
						
						
						
							
						
						
							9cb37ec349 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6007. Restore VM command fails with NPE.  
						
						 
						
						... 
						
						
						
						If a VM instance is deployed with startVm=false, then calling restoreVm on the instance fails with NPE
because CS tries to expunge a volume that has not been created in primary store. 
						
						
					 
					
						2014-02-03 12:32:14 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sanjay Tripathi 
							
						 
					 
					
						
						
						
						
							
						
						
							20fd2769a9 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5660: Migrate vm live migration succeeds but throws error as ""Failed to migrate the system vm"".  
						
						 
						
						
						
						
					 
					
						2014-01-30 16:29:18 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daan Hoogland 
							
						 
					 
					
						
						
						
						
							
						
						
							5d8e8fd3a2 
							
						 
					 
					
						
						
							
							findbugs: nullpointer guards and wrappertype comparisons(cherry picked  
						
						 
						
						... 
						
						
						
						from commit 791b7f8f7fe8f7d342e46fbb61a3f421e87fca59) 
						
						
					 
					
						2014-01-28 16:46:05 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nitin Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							1b89ae7acb 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5478:  
						
						 
						
						... 
						
						
						
						Publish uuid for deployvm action event. 
						
						
					 
					
						2014-01-22 16:50:50 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							bd79fb33a6 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5870: API support for retrieving user data  
						
						 
						
						
						
						
					 
					
						2014-01-16 15:31:18 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							47fd67b7fa 
							
						 
					 
					
						
						
							
							CLOUDSTACK-4987: when addNic to vm, don't make account check if the call is made by ROOT admin  
						
						 
						
						
						
						
					 
					
						2014-01-16 13:34:45 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							aa6dddc778 
							
						 
					 
					
						
						
							
							CLOUDSTACK-4987: when addNic to vm, don't make account check if the vm belongs to ROOT admin  
						
						 
						
						
						
						
					 
					
						2014-01-16 10:59:38 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Bharat Kumar 
							
						 
					 
					
						
						
						
						
							
						
						
							7053c222f9 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5651 deployVm: customparameters param name has to be changed  
						
						 
						
						... 
						
						
						
						Signed-off-by: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Conflicts:
	api/src/org/apache/cloudstack/api/command/admin/systemvm/ScaleSystemVMCmd.java
	api/src/org/apache/cloudstack/api/command/admin/systemvm/UpgradeSystemVMCmd.java
	api/src/org/apache/cloudstack/api/command/user/vm/DeployVMCmd.java
	api/src/org/apache/cloudstack/api/command/user/vm/ScaleVMCmd.java
	api/src/org/apache/cloudstack/api/command/user/vm/UpgradeVMCmd.java
	server/src/com/cloud/server/ManagementServerImpl.java
	server/src/com/cloud/vm/UserVmManagerImpl.java 
						
						
					 
					
						2014-01-10 10:01:43 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Bharat Kumar 
							
						 
					 
					
						
						
						
						
							
						
						
							776b5059fb 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5742 Add usage event detials for vm state transitions when using custom compute offering.  
						
						 
						
						... 
						
						
						
						Conflicts:
	server/src/com/cloud/vm/UserVmManagerImpl.java
	server/src/com/cloud/vm/UserVmStateListener.java 
						
						
					 
					
						2014-01-08 19:10:39 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sanjay Tripathi 
							
						 
					 
					
						
						
						
						
							
						
						
							c3d8e207c8 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5314: Negative (-ve) values for primary storage and volumes are shown in the resource count table.  
						
						 
						
						
						
						
					 
					
						2014-01-07 15:07:02 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jayapal 
							
						 
					 
					
						
						
						
						
							
						
						
							16763be77f 
							
						 
					 
					
						
						
							
							Fixed issue in setting vm ip,mac in vm_instance table  
						
						 
						
						... 
						
						
						
						This issue is not seen in 4.2, It is observed only in 4.3. 
						
						
					 
					
						2013-12-26 16:58:04 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nitin Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							f083f91b0b 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5281:  
						
						 
						
						... 
						
						
						
						Resource limit shouldnt be counted for resources with display flag = 0. Correcting this for the vms at the moment. 
						
						
					 
					
						2013-12-20 15:33:37 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Harikrishna Patnala 
							
						 
					 
					
						
						
						
						
							
						
						
							227567cf6c 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5554: Custom disk offering allows to create a datadisk with size greater than custom.diskoffering.size.max value  
						
						 
						
						
						
						
					 
					
						2013-12-19 22:56:34 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							be5e5cc641 
							
						 
					 
					
						
						
							
							All Checkstyle problems corrected  
						
						 
						
						
						
						
					 
					
						2013-12-12 12:26:07 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								tuna 
							
						 
					 
					
						
						
						
						
							
						
						
							f355359b23 
							
						 
					 
					
						
						
							
							fix issues  
						
						 
						
						
						
						
					 
					
						2013-12-10 10:37:28 +07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nitin Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							e79350d256 
							
						 
					 
					
						
						
							
							CLOUDSTACK-3664:  
						
						 
						
						... 
						
						
						
						scaling up vms was not considering parameter cluster.(memory/cpu).allocated.capacity.disablethreshold. Fixed it
Also added overprovisioning factor retrieval at the cluster level for host capacity check 
						
						
					 
					
						2013-12-09 15:40:17 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nitin Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							98ee087d31 
							
						 
					 
					
						
						
							
							CLOUDSTACK-4880:  
						
						 
						
						... 
						
						
						
						check for host cpu capability while dynamic scaling a vm on the same host 
						
						
					 
					
						2013-12-05 14:31:27 -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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Bharat Kumar 
							
						 
					 
					
						
						
						
						
							
						
						
							e5cfe94818 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5160 add a map to specify the custom compute parameters in the deployvm api.  
						
						 
						
						... 
						
						
						
						Signed-off-by: Jayapal <jayapal@apache.org> 
						
						
					 
					
						2013-12-04 11:28:45 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Devdeep Singh 
							
						 
					 
					
						
						
						
						
							
						
						
							5a96307fbf 
							
						 
					 
					
						
						
							
							Changes for allowing migration of a vm on hyperv. Migration was blocked in cloudstack for hyperv.  
						
						 
						
						... 
						
						
						
						Enabled it. Also updated the agent code to allow hyperv migration. 
						
						
					 
					
						2013-12-04 10:29:36 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nitin Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							d5e497859f 
							
						 
					 
					
						
						
							
							CLOUDSTACK-4881:  
						
						 
						
						... 
						
						
						
						changeServiceForVirtualMachine API should be used to scale up a stopped vm only 
						
						
					 
					
						2013-12-02 17:27:13 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Wei Zhou 
							
						 
					 
					
						
						
						
						
							
						
						
							f17f35eeb8 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5293: fix issue when collect vm disk statistics from iso  
						
						 
						
						
						
						
					 
					
						2013-11-27 14:38:25 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nitin Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							6bea532efa 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5206: Ability to control the external id of first  
						
						 
						
						... 
						
						
						
						class objects. Putting in the generic methods and trying it
 for objects like vm, volume. This is the first cut 
						
						
					 
					
						2013-11-26 09:52:17 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Bharat Kumar 
							
						 
					 
					
						
						
						
						
							
						
						
							ef40e156ed 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5162 Usage details are not getting populated when using dynamic offerings.  
						
						 
						
						... 
						
						
						
						Signed-off-by: Koushik Das <koushik@apache.org> 
						
						
					 
					
						2013-11-26 14:32:30 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							f00bfea61e 
							
						 
					 
					
						
						
							
							Fix CID 1127030, 1127029 Questionable Boxing of primitive value  
						
						 
						
						... 
						
						
						
						Fix CID 1127028 Fix Inefficient Map Iterator
Fix bug. 
						
						
					 
					
						2013-11-07 14:59:03 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							9631df8d0e 
							
						 
					 
					
						
						
							
							Fix CID 1127021 Operands don't affect results  
						
						 
						
						... 
						
						
						
						int can never be bigger than maxint.
Auto unboxing of Integer, not need for intValue() 
						
						
					 
					
						2013-11-07 13:34:48 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							f611c24dd5 
							
						 
					 
					
						
						
							
							Fix CID 1127027 Dereference before null check  
						
						 
						
						... 
						
						
						
						template can't be null at this point as it has already been dereferenced 
						
						
					 
					
						2013-11-07 13:34:48 +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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							6d7674982a 
							
						 
					 
					
						
						
							
							CLOUDSTACK-4979: fix hostName for VmWare vms to follow the same logic  
						
						 
						
						
						
						
					 
					
						2013-11-06 16:16:25 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							fac22936f6 
							
						 
					 
					
						
						
							
							CLOUDSTACK-4979: if no hostName is passed to deployVm call, automatically generated hostName follows the pattern <instance.id global config>-<randomly generated uuid>.  
						
						 
						
						... 
						
						
						
						Example: VM-a6c6457e-e4d0-486f-a392-9239be9b36f5 
						
						
					 
					
						2013-11-06 15:46:57 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Wei Zhou 
							
						 
					 
					
						
						
						
						
							
						
						
							382391f270 
							
						 
					 
					
						
						
							
							CLOUDSTACK-4987: only shared network and isolated network with same account can be assigned to a VM  
						
						 
						
						... 
						
						
						
						(cherry picked from commit 743eed8771ce0fc382c3f1018e42d357d79163c5) 
						
						
					 
					
						2013-10-31 11:37:31 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							591dcd1d1c 
							
						 
					 
					
						
						
							
							ResourceDetails: added "display" field to a bunch of VOs - determines whether the detail should be returned to the regular user  
						
						 
						
						
						
						
					 
					
						2013-10-29 09:18:11 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Likitha Shetty 
							
						 
					 
					
						
						
						
						
							
						
						
							cc4b612bf6 
							
						 
					 
					
						
						
							
							CLOUDSTACK-4985. NPE while deleting old root volumes of a restored VM during storage garbage collection.  
						
						 
						
						... 
						
						
						
						In case of VMware, once the state of the old root volume has been updated to destroyed force expunge it from primary storage to avoid the garbage collector from trying to delete the new root volume 
						
						
					 
					
						2013-10-29 11:31:45 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Wei Zhou 
							
						 
					 
					
						
						
						
						
							
						
						
							059e3beb28 
							
						 
					 
					
						
						
							
							CLOUDSTACK-4505: add ExpungeVM command to expunge a destroyed VM on demand  
						
						 
						
						
						
						
					 
					
						2013-10-24 11:52:00 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Darren Shepherd 
							
						 
					 
					
						
						
						
						
							
						
						
							205a77a5bb 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/txn-refactor'  
						
						 
						
						... 
						
						
						
						Conflicts:
	engine/orchestration/src/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java
	server/src/com/cloud/configuration/ConfigurationManagerImpl.java
	server/src/com/cloud/metadata/ResourceMetaDataManagerImpl.java
	server/src/com/cloud/vm/UserVmManagerImpl.java 
						
						
					 
					
						2013-10-23 10:40:44 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Darren Shepherd 
							
						 
					 
					
						
						
						
						
							
						
						
							edeaf98117 
							
						 
					 
					
						
						
							
							Cleaner and more type safe Transaction API for checked exceptions  
						
						 
						
						
						
						
					 
					
						2013-10-23 10:02:43 -07:00