Likitha Shetty 
							
						 
					 
					
						
						
						
						
							
						
						
							008b029a29 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5891.[VMware] If a template has been registered and "cpu.corespersocket=X" template details have been added for it,  
						
						... 
						
						
						
						then any instance deployed from that template should have X cores per socket 
						
						
					 
					
						2014-01-17 11:00:48 +05:30 
						 
				 
			
				
					
						
							
							
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							0cdf0f6f67 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5779: Moving bumpUpPriority, edithosts.sh, dnsmasq.sh to use routeProxy  
						
						
						
						
					 
					
						2014-01-16 16:03:09 -08:00 
						 
				 
			
				
					
						
							
							
								Likitha Shetty 
							
						 
					 
					
						
						
						
						
							
						
						
							a957d52a3c 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5707. Hitting multiple 'User unauthenticated' exceptions when vCenter is upgraded to 5.5 from 5.1.  
						
						... 
						
						
						
						We hit these excptions whenever a management server held session that was with the old 5.1 vCenter server
is used to make resource calls to the new 5.5 vCenter.
Validate a vCenter session context before it is being used to make a resource call.
And if the context is invalid then discard the context and retrieve a new one.
During the invalidation of an old context handle the context disconnect better
by catching the appropriate exception and returning a newly created context.
Conflicts:
	plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareContextFactory.java
	plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
	plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareSecondaryStorageResourceHandler.java
	vmware-base/src/com/cloud/hypervisor/vmware/util/VmwareContext.java 
						
						
					 
					
						2014-01-14 09:38:50 +05:30 
						 
				 
			
				
					
						
							
							
								Mike Tutkowski 
							
						 
					 
					
						
						
						
						
							
						
						
							a354d969ce 
							
						 
					 
					
						
						
							
							Merge from 4.3: CLOUDSTACK-5823: Taking a VMware snapshot doesn't work  
						
						
						
						
					 
					
						2014-01-09 23:10:40 -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 
						 
				 
			
				
					
						
							
							
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							64b8d1044d 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5819:extractTemplate fails with Vmware host on migration of  
						
						... 
						
						
						
						NFS to S3. 
						
						
					 
					
						2014-01-09 15:08:23 -08:00 
						 
				 
			
				
					
						
							
							
								Mike Tutkowski 
							
						 
					 
					
						
						
						
						
							
						
						
							8b6e89c012 
							
						 
					 
					
						
						
							
							Merge from 4.3: CLOUDSTACK-4810: Enable hypervisor snapshots for CloudStack-managed storage (for XenServer and VMware)  
						
						
						
						
					 
					
						2014-01-09 15:44:02 -07:00 
						 
				 
			
				
					
						
							
							
								Likitha Shetty 
							
						 
					 
					
						
						
						
						
							
						
						
							bc677e2a99 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5782. [VMware] Snapshot creation on a detached volume failes with NPE.  
						
						... 
						
						
						
						For a detached volume, don't try to find the associated VM on the hypervisor/peer hypervisor host.
By default create a worker VM to perform snapshot operations.
Conflicts:
	plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareStorageProcessor.java 
						
						
					 
					
						2014-01-06 14:34:15 +05:30 
						 
				 
			
				
					
						
							
							
								Likitha Shetty 
							
						 
					 
					
						
						
						
						
							
						
						
							50c2119a84 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5704. OVA files exist for templates created from volumes.  
						
						... 
						
						
						
						Don't package the OVF and VMDK files into OVA after a template is created from volume.
Since packaging process contains reading and writing from the NFS mount, it doubles the amount of data that needs to be moved around
Conflicts:
	plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareStorageProcessor.java 
						
						
					 
					
						2014-01-02 16:39:07 +05:30 
						 
				 
			
				
					
						
							
							
								Sateesh Chodapuneedi 
							
						 
					 
					
						
						
						
						
							
						
						
							68e0bf39d0 
							
						 
					 
					
						
						
							
							Fix check style error.  
						
						
						
						
					 
					
						2013-12-31 07:04:17 +05:30 
						 
				 
			
				
					
						
							
							
								Sateesh Chodapuneedi 
							
						 
					 
					
						
						
						
						
							
						
						
							6ba9754201 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5447 [Automation] Volume migration failing with NullPointerException in vmware and KVM.  
						
						... 
						
						
						
						Instead of injecting object of VolumeOrchestrationService into VmwareResource, we now populate the command object (MigrateVolumeCommand here) with required information. Thus we dont need volume orchestration service to query that information from resource.
Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org> 
						
						
					 
					
						2013-12-31 06:31:43 +05:30 
						 
				 
			
				
					
						
							
							
								Sateesh Chodapuneedi 
							
						 
					 
					
						
						
						
						
							
						
						
							9ca34f14a2 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5666 Cant remove a nic when a vm is in the Stopped state  
						
						... 
						
						
						
						When VM is not running, existing code is unable to retrieve associated cluster's Id. Now we will try to get this information using previous host where the VM was running.
Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>
Conflicts:
	plugins/hypervisors/vmware/src/com/cloud/hypervisor/guru/VMwareGuru.java 
						
						
					 
					
						2013-12-28 09:13:58 +05:30 
						 
				 
			
				
					
						
							
							
								Sateesh Chodapuneedi 
							
						 
					 
					
						
						
						
						
							
						
						
							db99146187 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5661 [VMware] DetachIsoCmd succeeds even though cdrom is locked by VM as cdrom is mounted  
						
						... 
						
						
						
						DetachISO is succeeding even though detach opeartion is failing as cdrom is locked by VM as it was mounted inside VM.
Detect if cdrom is locked or not. If locked fail detach operation and warn user to unmount before detaching the iso/cdrom device.
Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>
Conflicts:
	plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
	plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareStorageProcessor.java
	vmware-base/src/com/cloud/hypervisor/vmware/mo/VirtualMachineMO.java 
						
						
					 
					
						2013-12-28 02:36:53 +05:30 
						 
				 
			
				
					
						
							
							
								Marcus Sorensen 
							
						 
					 
					
						
						
						
						
							
						
						
							95364a4022 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5531  
						
						... 
						
						
						
						Initial support for vhd, raw, vmdk image formats on KVM. Tested all formats with local and CLVM. 
						
						
					 
					
						2013-12-16 14:32:51 -07:00 
						 
				 
			
				
					
						
							
							
								Likitha Shetty 
							
						 
					 
					
						
						
						
						
							
						
						
							fa2f18d2a2 
							
						 
					 
					
						
						
							
							CLOUDSTACK-4875. Vmware vCenter 5.5 - System VM deployment fails During VM deployment.  
						
						... 
						
						
						
						When base template is being cloned to create VM ROOT disk, get the disk path i.e. base file name
of the VM's ROOT disk from vCenter 
						
						
					 
					
						2013-12-17 18:31:15 +05:30 
						 
				 
			
				
					
						
							
							
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							be5e5cc641 
							
						 
					 
					
						
						
							
							All Checkstyle problems corrected  
						
						
						
						
					 
					
						2013-12-12 12:26:07 -08:00 
						 
				 
			
				
					
						
							
							
								Bharat Kumar 
							
						 
					 
					
						
						
						
						
							
						
						
							36cbc2dfbf 
							
						 
					 
					
						
						
							
							CLOUDSTACK-4498 we should not reserve memory and cpu for vmware VMs if the  
						
						... 
						
						
						
						vmware.reserve.cpu and vmware.reserve.mem are set to false while not overcommiting
Signed-off-by: Jayapal <jayapal@apache.org> 
						
						
					 
					
						2013-12-11 13:07:56 +05:30 
						 
				 
			
				
					
						
							
							
								Likitha Shetty 
							
						 
					 
					
						
						
						
						
							
						
						
							e6127a7c00 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5216. delete volume failed due to Exception: java.lang.Exception" while destroying Vms  
						
						
						
						
					 
					
						2013-12-06 12:04:02 +05:30 
						 
				 
			
				
					
						
							
							
								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 
						 
				 
			
				
					
						
							
							
								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 
							
						 
					 
					
						
						
						
						
							
						
						
							eaa250fd3c 
							
						 
					 
					
						
						
							
							Formatted again after all the tab expansions and eol removals  
						
						
						
						
					 
					
						2013-11-21 04:47:01 -08:00 
						 
				 
			
				
					
						
							
							
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							224f479974 
							
						 
					 
					
						
						
							
							Removed trailing spaces  
						
						
						
						
					 
					
						2013-11-21 04:08:01 -08:00 
						 
				 
			
				
					
						
							
							
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							e4b22d0fca 
							
						 
					 
					
						
						
							
							Replace all tabs, particularly the ones in the comments  
						
						
						
						
					 
					
						2013-11-21 03:39:58 -08:00 
						 
				 
			
				
					
						
							
							
								Likitha Shetty 
							
						 
					 
					
						
						
						
						
							
						
						
							273c912bb6 
							
						 
					 
					
						
						
							
							CLOUDSTACK-1868. GetVmStatsCommand throws NullPointerException with VMWare.  
						
						
						
						
					 
					
						2013-11-21 09:39:44 +05:30 
						 
				 
			
				
					
						
							
							
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							8d62744681 
							
						 
					 
					
						
						
							
							Reformat all source code.  Added checkstyle to check the source code  
						
						
						
						
					 
					
						2013-11-20 07:26:53 -08:00 
						 
				 
			
				
					
						
							
							
								Likitha Shetty 
							
						 
					 
					
						
						
						
						
							
						
						
							90fb76a72c 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5069. Added global config 'vmware.vcenter.session.timeout' to make the vCenter session timeout value configurable.  
						
						
						
						
					 
					
						2013-11-20 16:12:22 +05:30 
						 
				 
			
				
					
						
							
							
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							fc9adec72e 
							
						 
					 
					
						
						
							
							CLOUDSTACK-669: Add host level side-by-side VM state report for graceful sync model migration  
						
						
						
						
					 
					
						2013-11-12 18:32:51 -08:00 
						 
				 
			
				
					
						
							
							
								Likitha Shetty 
							
						 
					 
					
						
						
						
						
							
						
						
							a35425eec6 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5122. System VMs are getting recreated with old template after upgrading to 4.2.  
						
						... 
						
						
						
						In VMware during VM start the existing disk information is used to configure the VMs. So even if a new disk is created using the new template VM continues to use the old disk.
Once the old root disk is marked for destroy force expunge it and sync the new disk into the VM folder before VM start 
						
						
					 
					
						2013-11-10 23:31:56 +05:30 
						 
				 
			
				
					
						
							
							
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							4815b024bf 
							
						 
					 
					
						
						
							
							Add quiesce vm for vmware during vm snapshot  
						
						
						
						
					 
					
						2013-11-08 15:47:11 -08:00 
						 
				 
			
				
					
						
							
							
								Chris Suich 
							
						 
					 
					
						
						
						
						
							
						
						
							f826dfb918 
							
						 
					 
					
						
						
							
							Fixed bug with deleting VMWare VM Snapshots  
						
						... 
						
						
						
						Signed-off-by: Edison Su <sudison@gmail.com> 
						
						
					 
					
						2013-11-07 14:29:35 -08:00 
						 
				 
			
				
					
						
							
							
								Chris Suich 
							
						 
					 
					
						
						
						
						
							
						
						
							d0123f9594 
							
						 
					 
					
						
						
							
							Added option to reload VM during in RevertToVMSnapshotCommand (only in VMWare as I don't believe that XenServer supports anything similar)  
						
						... 
						
						
						
						Signed-off-by: Edison Su <sudison@gmail.com> 
						
						
					 
					
						2013-11-07 14:23:36 -08:00 
						 
				 
			
				
					
						
							
							
								Likitha Shetty 
							
						 
					 
					
						
						
						
						
							
						
						
							f03dcdab19 
							
						 
					 
					
						
						
							
							[CLOUDSTACK-5051] Revert "CLOUDSTACK-3715. Socket timeout error is observed in VMware setup if a VMware task (RelocateVM_Task, CloneVM_Task etc.) takes more than 10 minutes. Making this value configurable to allow admins to modify the timeout if required. It defaults to the current value i.e. 10 minutes."  
						
						... 
						
						
						
						This reverts commit 3a9150017339fa9447e7e30b854ccd3351695dcc.
Conflicts:
	plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareSecondaryStorageContextFactory.java 
						
						
					 
					
						2013-11-06 19:07:33 +05:30 
						 
				 
			
				
					
						
							
							
								Jayapal 
							
						 
					 
					
						
						
						
						
							
						
						
							88170f9a79 
							
						 
					 
					
						
						
							
							CLOUDSTACK-4736 Monitoring service kvm vmware resource changes  
						
						
						
						
					 
					
						2013-11-06 18:37:43 +05:30 
						 
				 
			
				
					
						
							
							
								Likitha Shetty 
							
						 
					 
					
						
						
						
						
							
						
						
							0ef6135198 
							
						 
					 
					
						
						
							
							CLOUDSTACK-3715. Fix import error.  
						
						
						
						
					 
					
						2013-11-05 17:42:17 +05:30 
						 
				 
			
				
					
						
							
							
								Harikrishna Patnala 
							
						 
					 
					
						
						
						
						
							
						
						
							a286dec098 
							
						 
					 
					
						
						
							
							CLOUDSTACK-4908: CPU socket count of host Adding cpu socket count of the host in hostresponse  
						
						... 
						
						
						
						Signed-off-by: Koushik Das <koushik@apache.org> 
						
						
					 
					
						2013-11-05 16:12:36 +05:30 
						 
				 
			
				
					
						
							
							
								Likitha Shetty 
							
						 
					 
					
						
						
						
						
							
						
						
							3a91500173 
							
						 
					 
					
						
						
							
							CLOUDSTACK-3715. Socket timeout error is observed in VMware setup if a VMware task (RelocateVM_Task, CloneVM_Task etc.) takes more than 10 minutes. Making this value configurable to allow admins to modify the timeout if required. It defaults to the current value i.e. 10 minutes.  
						
						
						
						
					 
					
						2013-11-05 15:59:03 +05:30 
						 
				 
			
				
					
						
							
							
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							e60037cb80 
							
						 
					 
					
						
						
							
							Remove primarydatastoreTo in vmwareresource  
						
						
						
						
					 
					
						2013-11-04 14:37:24 -08:00 
						 
				 
			
				
					
						
							
							
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							7c99b88926 
							
						 
					 
					
						
						
							
							Don't use cast to PrimarydataStoreTO on the resource code  
						
						
						
						
					 
					
						2013-11-01 15:13:16 -07:00 
						 
				 
			
				
					
						
							
							
								Mike Tutkowski 
							
						 
					 
					
						
						
						
						
							
						
						
							449b5daa70 
							
						 
					 
					
						
						
							
							VMware changes related to managed storage  
						
						
						
						
					 
					
						2013-10-31 08:30:50 -06:00 
						 
				 
			
				
					
						
							
							
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							3205cd42b5 
							
						 
					 
					
						
						
							
							CLOUDSTACK-730: Site-to-site VPN between VPC VR to VR  
						
						... 
						
						
						
						Now VPN connection can be created as "passive", which would enable the ability
of remote peer initiate the connection. So it's possible for VPC VR to
establish the connection to another VPC VR of CloudStack.
Test case also included.
The test case would create 2 vpcs and using VPN to connect them. 
						
						
					 
					
						2013-10-30 19:30:22 -07:00 
						 
				 
			
				
					
						
							
							
								Likitha Shetty 
							
						 
					 
					
						
						
						
						
							
						
						
							7116268f33 
							
						 
					 
					
						
						
							
							CLOUDSTACK-4946. VM Restore with template id/Volatile VM feature doesnt work on VMware  
						
						... 
						
						
						
						When a ROOT volume is created from base template, if a folder already exists for the ROOT volume's VM then replace the old ROOT disk files with the new one. 
						
						
					 
					
						2013-10-28 13:17:54 +05:30 
						 
				 
			
				
					
						
							
							
								Mike Tutkowski 
							
						 
					 
					
						
						
						
						
							
						
						
							858ce76665 
							
						 
					 
					
						
						
							
							Extend support of CloudStack-managed storage to KVM  
						
						
						
						
					 
					
						2013-10-27 22:30:03 -06: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 
						 
				 
			
				
					
						
							
							
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							df1924d910 
							
						 
					 
					
						
						
							
							CLOUDSTACK-754: Fix KVM and Vmware resource for VPN  
						
						
						
						
					 
					
						2013-10-24 17:43:03 -07:00 
						 
				 
			
				
					
						
							
							
								Darren Shepherd 
							
						 
					 
					
						
						
						
						
							
						
						
							891b85d516 
							
						 
					 
					
						
						
							
							Add missing licenses  
						
						
						
						
					 
					
						2013-10-23 15:20:08 -07:00 
						 
				 
			
				
					
						
							
							
								Darren Shepherd 
							
						 
					 
					
						
						
						
						
							
						
						
							c9101966e0 
							
						 
					 
					
						
						
							
							Added StorageStrategyFactory to centralize and deduplicate some logic  
						
						
						
						
					 
					
						2013-10-23 12:40:41 -07:00 
						 
				 
			
				
					
						
							
							
								Darren Shepherd 
							
						 
					 
					
						
						
						
						
							
						
						
							e3280bdba2 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/spring-modularization'  
						
						... 
						
						
						
						Conflicts:
	client/tomcatconf/applicationContext.xml.in
	client/tomcatconf/nonossComponentContext.xml.in
	client/tomcatconf/simulatorComponentContext.xml.in
	framework/db/src/com/cloud/utils/db/Transaction.java
	plugins/hypervisors/simulator/src/com/cloud/agent/manager/MockAgentManagerImpl.java
	server/src/com/cloud/api/ApiServer.java
	server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java 
						
						
					 
					
						2013-10-23 11:14:42 -07:00