Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							434f8dab72 
							
						 
					 
					
						
						
							
							Remove the hacking way of blocking VM state transition introduced by individual VM snapshot orchestration flow  
						
						 
						
						
						
						
					 
					
						2014-02-28 15:35:58 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							58c26ee128 
							
						 
					 
					
						
						
							
							return the correct NicProfile after job completion for VPC AddVmToNetwork command  
						
						 
						
						
						
						
					 
					
						2014-02-28 15:35:58 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							18b5fb5a3c 
							
						 
					 
					
						
						
							
							do not shutdown alien VMs upon host startup. Send StopCommand for out-of-band stopped VM to restore legacy XS/KVM behave  
						
						 
						
						
						
						
					 
					
						2014-02-28 15:35:58 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							85adaf83c7 
							
						 
					 
					
						
						
							
							check report-missing event for VM in starting state.  
						
						 
						
						
						
						
					 
					
						2014-02-28 15:35:57 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							13e956a10c 
							
						 
					 
					
						
						
							
							Add a missing initialization call to setup EntityManager in VmMigrateWork  
						
						 
						
						
						
						
					 
					
						2014-02-28 15:35:57 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							86a63c49bc 
							
						 
					 
					
						
						
							
							propagate job execution runtime exception to API context  
						
						 
						
						
						
						
					 
					
						2014-02-28 15:35:57 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							206a9ed53f 
							
						 
					 
					
						
						
							
							disable XS full host sync and delta sync when new sync model is enabled  
						
						 
						
						
						
						
					 
					
						2014-02-28 15:35:57 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							90ea3249a8 
							
						 
					 
					
						
						
							
							disable cluster-scope report from XS resource  
						
						 
						
						
						
						
					 
					
						2014-02-28 15:35:57 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							5d73217723 
							
						 
					 
					
						
						
							
							process the missing power report of a VM that exists in CloudStack but not in hypervisor  
						
						 
						
						
						
						
					 
					
						2014-02-28 15:35:57 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							fda7219646 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5928: disable host delta sync when new VM sync is enabled  
						
						 
						
						
						
						
					 
					
						2014-02-28 15:35:57 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							441be43b8c 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5358: Bring back concurrency control in sync-queue management  
						
						 
						
						
						
						
					 
					
						2014-02-28 15:35:57 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Prachi Damle 
							
						 
					 
					
						
						
						
						
							
						
						
							f41604fc6c 
							
						 
					 
					
						
						
							
							Renaming AclEntityType --> IAMEntityType  
						
						 
						
						
						
						
					 
					
						2014-02-25 16:43:17 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								wrodrigues 
							
						 
					 
					
						
						
						
						
							
						
						
							3a7e4103fc 
							
						 
					 
					
						
						
							
							FindBugs findings: fixing equals() methods in 2 classes; commenting out dead variable in 1 class; adding 5 tests to cover the changes in the equals() methods.  
						
						 
						
						... 
						
						
						
						Signed-off-by: Hugo Trippaers <htrippaers@schubergphilis.com> 
						
						
					 
					
						2014-02-25 15:18:16 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Koushik Das 
							
						 
					 
					
						
						
						
						
							
						
						
							167babd8c8 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6124: During MS maintenance unfinished work items are not cleaned up resulting in them getting repeated for every subsequent maintenance  
						
						 
						
						... 
						
						
						
						Updating the op_it_work table entry appropriately in db once the unfinished work item is completed. 
						
						
					 
					
						2014-02-21 16:29:51 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							97bad4f9b3 
							
						 
					 
					
						
						
							
							Fix checkstyle and license issues  
						
						 
						
						
						
						
					 
					
						2014-02-14 18:37:47 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							26b32141a8 
							
						 
					 
					
						
						
							
							Findbugs : Fixes for several findings  
						
						 
						
						... 
						
						
						
						Made a comment on the use of ConcurrentHashMap for _agent
Conflicts:
	engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java 
						
						
					 
					
						2014-02-14 18:37:45 +01: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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daan Hoogland 
							
						 
					 
					
						
						
						
						
							
						
						
							8e4d020cf8 
							
						 
					 
					
						
						
							
							remove nic with dhcp and tests  
						
						 
						
						... 
						
						
						
						Signed-off-by: Alena Prokharchyk <alena.prokharchyk@citrix.com> 
						
						
					 
					
						2014-02-13 10:39:02 -08: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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							3b58a45e04 
							
						 
					 
					
						
						
							
							Merge branch 'master' into rbac.  
						
						 
						
						
						
						
					 
					
						2014-02-07 13:43:36 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Soheil Eizadi 
							
						 
					 
					
						
						
						
						
							
						
						
							6523c06869 
							
						 
					 
					
						
						
							
							NetworkManager Exception Fix Due to call to getDhcpServiceProvider()  
						
						 
						
						
						
						
					 
					
						2014-02-05 17:14:05 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Prachi Damle 
							
						 
					 
					
						
						
						
						
							
						
						
							f84375442e 
							
						 
					 
					
						
						
							
							Merge branch 'master' into rbac  
						
						 
						
						... 
						
						
						
						Conflicts:
	api/src/org/apache/cloudstack/api/command/user/autoscale/ListAutoScaleVmProfilesCmd.java
	api/src/org/apache/cloudstack/api/command/user/volume/ResizeVolumeCmd.java
	plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/MockAccountManager.java
	server/src/com/cloud/api/ApiServer.java
	server/src/com/cloud/api/query/QueryManagerImpl.java
	server/src/com/cloud/template/TemplateAdapterBase.java
	setup/db/db/schema-430to440.sql
	tools/apidoc/gen_toc.py 
						
						
					 
					
						2014-02-04 12:07:32 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Prachi Damle 
							
						 
					 
					
						
						
						
						
							
						
						
							022b9b8f80 
							
						 
					 
					
						
						
							
							Add access for domain wide createAffinityGroup  
						
						 
						
						
						
						
					 
					
						2014-02-03 18:14:56 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Prachi Damle 
							
						 
					 
					
						
						
						
						
							
						
						
							a6d07c873c 
							
						 
					 
					
						
						
							
							Changes to QuerySelector to list the parent group resources with recursive = true access  
						
						 
						
						
						
						
					 
					
						2014-02-03 17:49:33 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Prachi Damle 
							
						 
					 
					
						
						
						
						
							
						
						
							939b15169c 
							
						 
					 
					
						
						
							
							changes to support the domain wide resources for Network  
						
						 
						
						
						
						
					 
					
						2014-02-03 17:34:03 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daan Hoogland 
							
						 
					 
					
						
						
						
						
							
						
						
							9778481d85 
							
						 
					 
					
						
						
							
							findbugs: handling of long values and wrappers  
						
						 
						
						
						
						
					 
					
						2014-02-03 20:19:11 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Koushik Das 
							
						 
					 
					
						
						
						
						
							
						
						
							580ebb0010 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5989: Trying to start a vm while 'vm snapshot' is in progress results in inconsistency  
						
						 
						
						... 
						
						
						
						The fix is to fail the start operation if a vm snapshot is in progress 
						
						
					 
					
						2014-01-31 10:39:43 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Prachi Damle 
							
						 
					 
					
						
						
						
						
							
						
						
							d12422bf68 
							
						 
					 
					
						
						
							
							Add policies to domain group for CreateNetwork usecase for a domain wide shared network  
						
						 
						
						
						
						
					 
					
						2014-01-29 23:56:25 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Laszlo Hornyak 
							
						 
					 
					
						
						
						
						
							
						
						
							ebf57654e7 
							
						 
					 
					
						
						
							
							replaced Long instantiations with Autoboxing  
						
						 
						
						... 
						
						
						
						Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com> 
						
						
					 
					
						2014-01-25 15:01:03 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Mike Tutkowski 
							
						 
					 
					
						
						
						
						
							
						
						
							b5b4607f79 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5873: [Automation] Failed to attach volume to VM, if the vm is created with option startvm=false  
						
						 
						
						
						
						
					 
					
						2014-01-22 11:17:39 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Mike Tutkowski 
							
						 
					 
					
						
						
						
						
							
						
						
							90e945fd74 
							
						 
					 
					
						
						
							
							Fixing an issue with expunge logic  
						
						 
						
						
						
						
					 
					
						2014-01-20 16:25:39 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Mike Tutkowski 
							
						 
					 
					
						
						
						
						
							
						
						
							37332ad9d4 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5873: [Automation] Failed to attach volume to VM, if the vm is created with option startvm=false  
						
						 
						
						
						
						
					 
					
						2014-01-18 18:07:10 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							a9733b5df2 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5731: Use general instance type to categorize VM work jobs to correctly serialize VM operations  
						
						 
						
						
						
						
					 
					
						2014-01-17 11:55:14 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Anthony Xu 
							
						 
					 
					
						
						
						
						
							
						
						
							58a9a9b0cd 
							
						 
					 
					
						
						
							
							only send stop command when agent reports VM running and CS thinks it is stopped.  
						
						 
						
						
						
						
					 
					
						2014-01-17 11:50:13 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Prachi Damle 
							
						 
					 
					
						
						
						
						
							
						
						
							8a20d89d14 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5895: CreateVolumeFromSnapshot can fail in a multiple pod environment with tagged storagepool  
						
						 
						
						... 
						
						
						
						Changes:
- After finding the storagepool suitable to create the volume, we should not look for more pods 
						
						
					 
					
						2014-01-17 11:22:20 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Mike Tutkowski 
							
						 
					 
					
						
						
						
						
							
						
						
							e9c9887ee0 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5873: [Automation] Failed to attach volume to VM, if the vm is created with option startvm=false  
						
						 
						
						
						
						
					 
					
						2014-01-16 12:20:54 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							7164fc6e73 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5696: Fix sync issue with out-of-band changes  
						
						 
						
						
						
						
					 
					
						2014-01-15 13:11:02 -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 
							
						 
					 
					
						
						
						
						
							
						
						
							6944bf9bba 
							
						 
					 
					
						
						
							
							Merge from 4.3: CLOUDSTACK-5662: XenServer can't discover iSCSI targets with different credentials  
						
						 
						
						
						
						
					 
					
						2014-01-09 22:02:43 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							1e2e1ea051 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5765: cleanup internal serialization and exception propagation issues  
						
						 
						
						
						
						
					 
					
						2014-01-09 14:29:13 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							0965adb003 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5672: Fix VM work job serialization issues in Add/Remove nic  
						
						 
						
						
						
						
					 
					
						2014-01-09 14:29:12 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							87381d4236 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5725: put origin flow context id into log4j context prefix to link jobs with the orchestration work flow in logging  
						
						 
						
						
						
						
					 
					
						2014-01-09 14:29:12 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							ad6454d2bf 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5767: Remove the logic of using underlying job related fields for volume specific logic.  
						
						 
						
						
						
						
					 
					
						2014-01-09 14:29:12 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							737a382c38 
							
						 
					 
					
						
						
							
							Fix a typo caused problem in attach-volume process  
						
						 
						
						
						
						
					 
					
						2014-01-09 14:29:12 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							0587382265 
							
						 
					 
					
						
						
							
							CLOUDSTACK-669: Finalize VM work dispatching mechanism to avoid big switch statement  
						
						 
						
						
						
						
					 
					
						2014-01-09 14:29:12 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							a6f126d24e 
							
						 
					 
					
						
						
							
							Fix a style-check problem after cherry-pick  
						
						 
						
						
						
						
					 
					
						2014-01-09 14:29:12 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							8c93bd6080 
							
						 
					 
					
						
						
							
							CLOUDSTACK-669: Convert volume snapshot orchestration flow to make it be serialized with other VM operations  
						
						 
						
						
						
						
					 
					
						2014-01-09 14:29:12 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							bf9a554522 
							
						 
					 
					
						
						
							
							CLOUDSTACK-669: covert VMsnapshot orchestration flows to make them be serialized with other VM operations  
						
						 
						
						
						
						
					 
					
						2014-01-09 14:29:12 -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