Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							b35eb04de3 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6017: NPE while creating snapshot multiple times on same Root  
						
						... 
						
						
						
						volume with S3 as secondary storage. 
						
						
					 
					
						2014-02-03 12:16:19 -08:00 
						 
				 
			
				
					
						
							
							
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							d56c5dfc13 
							
						 
					 
					
						
						
							
							Fix for a potential NPE  
						
						
						
						
					 
					
						2014-01-31 09:37:11 +01:00 
						 
				 
			
				
					
						
							
							
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							16a9171f55 
							
						 
					 
					
						
						
							
							Fix trailing whitespace.  
						
						
						
						
					 
					
						2014-01-28 14:53:18 -08:00 
						 
				 
			
				
					
						
							
							
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							a26c81178b 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5971:Templates created from a snapshots can't be copied to  
						
						... 
						
						
						
						other zones. 
						
						
					 
					
						2014-01-28 14:49:58 -08:00 
						 
				 
			
				
					
						
							
							
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							33cd1ab921 
							
						 
					 
					
						
						
							
							Merge branch 'master' into rbac  
						
						
						
						
					 
					
						2014-01-22 11:23:51 -08:00 
						 
				 
			
				
					
						
							
							
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							c0da0a884a 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5921:S3 security key is stored in DB unencrypted  
						
						
						
						
					 
					
						2014-01-21 14:34:32 -08:00 
						 
				 
			
				
					
						
							
							
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							929fbabaa2 
							
						 
					 
					
						
						
							
							Merge branch 'master' into rbac.  
						
						
						
						
					 
					
						2014-01-17 14:37:08 -08:00 
						 
				 
			
				
					
						
							
							
								Mike Tutkowski 
							
						 
					 
					
						
						
						
						
							
						
						
							3ef560d925 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5873: [Automation] Failed to attach volume to VM, if the vm is created with option startvm=false  
						
						
						
						
					 
					
						2014-01-16 12:15:18 -07:00 
						 
				 
			
				
					
						
							
							
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							68b8891c62 
							
						 
					 
					
						
						
							
							Removed all reminants of the IdentityService.  Created the KeysManager to move the management  
						
						... 
						
						
						
						of keys out of management server 
						
						
					 
					
						2014-01-14 13:11:35 -08:00 
						 
				 
			
				
					
						
							
							
								Mike Tutkowski 
							
						 
					 
					
						
						
						
						
							
						
						
							21a44934b4 
							
						 
					 
					
						
						
							
							Removed a duplicate method  
						
						
						
						
					 
					
						2014-01-10 13:36:04 -07:00 
						 
				 
			
				
					
						
							
							
								Marcus Sorensen 
							
						 
					 
					
						
						
						
						
							
						
						
							fc082832d3 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5853  
						
						... 
						
						
						
						Create two storage pools, one with storage tag X, one with storage tag Y.
Create a service offering with storage tag X.
Create a disk offering with storage tag Y.
Attempt to deploy a virtual machine with a datadisk, using given offerings, it fails.
Deployment planner keeps a global object 'avoid'. It loops through each volume to
be created, asking storage allocators for matching pools, passing this avoid object.
First disk matches a pool or pools, adds ALL other pools to avoid object, then
deployment planner attaches matching pools to a list for that disk.
Second disk matches a pool, adds all other pools to avoid object, then deployment
planner says "wait, matching pool is in avoid, can't use it". Oops. In fact, at this
point ALL pools are in avoid (unless there are other pools that have both tags).
Need to remove matching pool from the avoid set during each select phase. 
						
						
					 
					
						2014-01-10 11:55:54 -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 
						 
				 
			
				
					
						
							
							
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							ae8560b195 
							
						 
					 
					
						
						
							
							Moved security out into its own jar.  Will be adding more to it.  Fixed a few white space issues brought up by checkstyle in eclipse.  
						
						
						
						
					 
					
						2014-01-09 16:12:25 -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 
						 
				 
			
				
					
						
							
							
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							858b9b1177 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5813: With S3 as secondary storage, snapshot taken in one  
						
						... 
						
						
						
						zone cannot be used to create volume in another zone. zoneId parameter
in createVolumeCmd is not observed. 
						
						
					 
					
						2014-01-08 17:15:04 -08:00 
						 
				 
			
				
					
						
							
							
								Sanjay Tripathi 
							
						 
					 
					
						
						
						
						
							
						
						
							3ad0e8fb47 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5701: physical size is not getting updated in snapshot_store_ref table.  
						
						
						
						
					 
					
						2014-01-06 11:36:43 +05:30 
						 
				 
			
				
					
						
							
							
								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 
						 
				 
			
				
					
						
							
							
								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 
						 
				 
			
				
					
						
							
							
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							5d262d7b59 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5648:CopyTemplate and CopyISO across zones fails after NFS  
						
						... 
						
						
						
						migration to S3. 
						
						
					 
					
						2013-12-26 12:39:39 -08:00 
						 
				 
			
				
					
						
							
							
								Likitha Shetty 
							
						 
					 
					
						
						
						
						
							
						
						
							e659751a8a 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5508. Vmware - When there are multiple secondary stores, the newly added secondary store is not being selected for backing up snapshots.  
						
						... 
						
						
						
						If the snapshot being backed up is a a delta snapshot, pick the image store where the parent snapshot is stored. Otheriwse pick a random image store. 
						
						
					 
					
						2013-12-24 17:34:19 +05:30 
						 
				 
			
				
					
						
							
							
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							c2baed665b 
							
						 
					 
					
						
						
							
							Moved the check-style.xml into the tools directory given that we're not using the project to reference the style any longer.  Fixed problems with eclipse complaining about copy-dependencies  
						
						
						
						
					 
					
						2013-12-20 17:21:34 -08:00 
						 
				 
			
				
					
						
							
							
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							e52a4d9306 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5572: quicevm won't save memory, as it needs pv driver installed  
						
						... 
						
						
						
						Conflicts:
	engine/storage/src/org/apache/cloudstack/storage/helper/HypervisorHelperImpl.java 
						
						
					 
					
						2013-12-20 12:36:30 -08:00 
						 
				 
			
				
					
						
							
							
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							62bb5d8848 
							
						 
					 
					
						
						
							
							fix checkstyle  
						
						
						
						
					 
					
						2013-12-19 15:05:58 -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 
						 
				 
			
				
					
						
							
							
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							c40d03b417 
							
						 
					 
					
						
						
							
							CS-18582: if EIP is used, extract volume and template returns wrong public ip address. If remote agent is ssvm agent, then looking up public ip address from ssvm table  
						
						... 
						
						
						
						Conflicts:
	engine/storage/integration-test/test/org/apache/cloudstack/storage/test/SnapshotTest.java
	engine/storage/integration-test/test/org/apache/cloudstack/storage/test/VolumeServiceTest.java
	engine/storage/integration-test/test/org/apache/cloudstack/storage/test/VolumeTest.java
	engine/storage/integration-test/test/org/apache/cloudstack/storage/test/VolumeTestVmware.java
	engine/storage/src/org/apache/cloudstack/storage/RemoteHostEndPoint.java
	engine/storage/src/org/apache/cloudstack/storage/endpoint/DefaultEndPointSelector.java 
						
						
					 
					
						2013-12-19 14:01:20 -08:00 
						 
				 
			
				
					
						
							
							
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							bb91b739a8 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5541: Template Creation from snapshot failed with S3 store.  
						
						
						
						
					 
					
						2013-12-18 15:44:00 -08:00 
						 
				 
			
				
					
						
							
							
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							46d1e1afb2 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5446:KVM-Secondary Store down-Even after secondary store is  
						
						... 
						
						
						
						brought back up after being down for few hours,snapshot jobs do not get
triggered with reason "there is other active snapshot tasks on the
instance to which the volume is attached". 
						
						
					 
					
						2013-12-13 22:04:29 -08:00 
						 
				 
			
				
					
						
							
							
								Prachi Damle 
							
						 
					 
					
						
						
						
						
							
						
						
							7c6f1c14c2 
							
						 
					 
					
						
						
							
							ControlledEntity Interface change to return EntityType and added values to the AclEntityType enum and  
						
						
						
						
					 
					
						2013-12-12 16:31:00 -08:00 
						 
				 
			
				
					
						
							
							
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							be5e5cc641 
							
						 
					 
					
						
						
							
							All Checkstyle problems corrected  
						
						
						
						
					 
					
						2013-12-12 12:26:07 -08:00 
						 
				 
			
				
					
						
							
							
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							df1c34bf2b 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5451:Restart MS after migrating NFS image store to S3,  
						
						... 
						
						
						
						previous Ready template is not ready anymore. 
						
						
					 
					
						2013-12-11 14:18:06 -08:00 
						 
				 
			
				
					
						
							
							
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							010b007ee4 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5414: With NFS Image Store migrated to S3 an error is thrown  
						
						... 
						
						
						
						in creation of Virtual Router. 
						
						
					 
					
						2013-12-11 14:17:43 -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 
						 
				 
			
				
					
						
							
							
								Wei Zhou 
							
						 
					 
					
						
						
						
						
							
						
						
							81c07f1791 
							
						 
					 
					
						
						
							
							allow delete snapshot with ERROR state  
						
						
						
						
					 
					
						2013-11-28 10:48:07 +01:00 
						 
				 
			
				
					
						
							
							
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							433a631916 
							
						 
					 
					
						
						
							
							Reformat of source code to set a stable base for the future.  I couldn't get checkstyle enabled.  There's still about a thousand errors from checkstyle.  Most of it from length errors from comments and strings.  Will attempt to remove those tonight.  This change is so large I just want to get it in before any merge nightmares.  The changes are fairly minor though and I did a full compile and start a server with the reformat code.  
						
						
						
						
					 
					
						2013-11-21 07:56:47 -08:00 
						 
				 
			
				
					
						
							
							
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							cf715ff491 
							
						 
					 
					
						
						
							
							Bump 4.3.0 to 4.4.0 in master  
						
						
						
						
					 
					
						2013-11-21 16:01:15 +01:00 
						 
				 
			
				
					
						
							
							
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							d620df2bdd 
							
						 
					 
					
						
						
							
							Reformatted all of the code.  
						
						
						
						
					 
					
						2013-11-21 06:15:26 -08:00 
						 
				 
			
				
					
						
							
							
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							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 
						 
				 
			
				
					
						
							
							
								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 
						 
				 
			
				
					
						
							
							
								Harikrishna Patnala 
							
						 
					 
					
						
						
						
						
							
						
						
							53b0bf6733 
							
						 
					 
					
						
						
							
							Template/ISO download fails cause the object to disappear from UI in 4.2  
						
						... 
						
						
						
						Signed-off-by: Koushik Das <koushik@apache.org> 
						
						
					 
					
						2013-11-11 10:58:43 +05:30 
						 
				 
			
				
					
						
							
							
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							4815b024bf 
							
						 
					 
					
						
						
							
							Add quiesce vm for vmware during vm snapshot  
						
						
						
						
					 
					
						2013-11-08 15:47:11 -08:00 
						 
				 
			
				
					
						
							
							
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							c233492bfc 
							
						 
					 
					
						
						
							
							Add quiencevm option on createsnapshotcmd  
						
						
						
						
					 
					
						2013-11-07 14:57:05 -08:00 
						 
				 
			
				
					
						
							
							
								Chris Suich 
							
						 
					 
					
						
						
						
						
							
						
						
							aef633f203 
							
						 
					 
					
						
						
							
							Updated VMSnapshotDetails* to match *Details* pattern (e.g. UserVMDetails*)  
						
						... 
						
						
						
						Signed-off-by: Edison Su <sudison@gmail.com> 
						
						
					 
					
						2013-11-07 14:28:19 -08:00 
						 
				 
			
				
					
						
							
							
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							f6f4a93145 
							
						 
					 
					
						
						
							
							Fix CID 1116743 Resource leak  
						
						
						
						
					 
					
						2013-11-07 16:23:20 +01:00