Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							d3fd66e9f5 
							
						 
					 
					
						
						
							
							Fix VM deploy failure bug introduced by commit  
						
						 
						
						... 
						
						
						
						39e5b768e8fcae9622e01b2ca72a49675eb6d3fb. 
						
						
					 
					
						2014-03-13 16:37:26 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Prachi Damle 
							
						 
					 
					
						
						
						
						
							
						
						
							36c0a4e2c3 
							
						 
					 
					
						
						
							
							Removed the AccessType.UseNetwork - replaced all referrences by  AccessType.UseEntry  
						
						 
						
						
						
						
					 
					
						2014-03-13 15:32:38 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							84a528fad6 
							
						 
					 
					
						
						
							
							Merge branch 'master' into rbac  
						
						 
						
						
						
						
					 
					
						2014-03-13 14:52:37 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Prachi Damle 
							
						 
					 
					
						
						
						
						
							
						
						
							fa80c63c33 
							
						 
					 
					
						
						
							
							Removing the copy task that is not needed any more.  
						
						 
						
						... 
						
						
						
						We do not need to copy commands.properties to utils anymore since the IAM permissions are no longer loaded during Upgrade 
						
						
					 
					
						2014-03-13 14:14:12 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Prachi Damle 
							
						 
					 
					
						
						
						
						
							
						
						
							1f6263dead 
							
						 
					 
					
						
						
							
							fix build for the juniper-contrail plugin  
						
						 
						
						
						
						
					 
					
						2014-03-13 13:50:36 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							90c485e5d6 
							
						 
					 
					
						
						
							
							Fixed some problems reported by FindBugs  
						
						 
						
						
						
						
					 
					
						2014-03-13 13:45:30 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Prachi Damle 
							
						 
					 
					
						
						
						
						
							
						
						
							d9696b26e1 
							
						 
					 
					
						
						
							
							After merge, fix isRootAdmin() calls to use accountId instead of type  
						
						 
						
						
						
						
					 
					
						2014-03-13 13:28:40 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							67ab3211bd 
							
						 
					 
					
						
						
							
							Removed getUUID() method from Domain interface as this interface already implements @Identity where getUUID is defined  
						
						 
						
						
						
						
					 
					
						2014-03-13 12:54:13 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							df85211945 
							
						 
					 
					
						
						
							
							Removed unused imports and instance vars from FirstFitAllocator  
						
						 
						
						
						
						
					 
					
						2014-03-13 11:05:37 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							99bdc8d875 
							
						 
					 
					
						
						
							
							Merge branch 'master' into rbac.  
						
						 
						
						
						
						
					 
					
						2014-03-13 11:05:03 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Antonio Fornie 
							
						 
					 
					
						
						
						
						
							
						
						
							39e5b768e8 
							
						 
					 
					
						
						
							
							More generic parameters that are not unknown  
						
						 
						
						... 
						
						
						
						Adding some more parameter names that should not be considered unknown since they belong to general use paramters
Signed-off-by: Alena Prokharchyk <alena.prokharchyk@citrix.com> 
						
						
					 
					
						2014-03-13 10:40:14 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Koushik Das 
							
						 
					 
					
						
						
						
						
							
						
						
							5779292e93 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6052: List VM enhancement to support querying with multiple VM IDs  
						
						 
						
						... 
						
						
						
						New parameter 'ids' added to listVirtualMachine API. The syntax looks like
http://localhost:8096/api?command=listVirtualMachines&listAll=true&ids=eddac053-9b12-4d2e-acb7-233de2e98112,009966fc-4d7b-4f84-8609-254979ba0134 
The new parameter will be mutually exclusive with the existing 'id' parameter. 
						
						
					 
					
						2014-03-13 17:05:35 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sanjay Tripathi 
							
						 
					 
					
						
						
						
						
							
						
						
							bc4c8052fd 
							
						 
					 
					
						
						
							
							findbugs: impossible cast in CreateServiceOfferingCmd file.  
						
						 
						
						
						
						
					 
					
						2014-03-13 15:04:18 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								amogh.vasekar 
							
						 
					 
					
						
						
						
						
							
						
						
							3ee1fc28de 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6217:  
						
						 
						
						... 
						
						
						
						Add APIs for ability to add new guest OS types, and their hypervisor specific mappings.
The table guest_os_hypervisor is currently maintained but not used, and the APIs reuse the same
Signed off by: Nitin Mehta <nitin.mehta@citrix.com> 
						
						
					 
					
						2014-03-12 17:03:38 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							cd8af6a3e2 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6236:Negative ref_cnt of template(snapshot/volume)_store_ref results in out-of-range error in Mysql  
						
						 
						
						
						
						
					 
					
						2014-03-12 16:17:53 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							40192cd8a1 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6235 - return gateway/netmask of publicVlan, along with the EIP information, for system vms in EIP/ELB setup  
						
						 
						
						
						
						
					 
					
						2014-03-12 15:11:01 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daan Hoogland 
							
						 
					 
					
						
						
						
						
							
						
						
							b5c8a56eea 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6232 allow expansion of ip on isolated networks as well  
						
						 
						
						
						
						
					 
					
						2014-03-12 19:36:11 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daan Hoogland 
							
						 
					 
					
						
						
						
						
							
						
						
							6c035240ba 
							
						 
					 
					
						
						
							
							check-style: tabs to spaces  
						
						 
						
						
						
						
					 
					
						2014-03-12 18:04:22 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daan Hoogland 
							
						 
					 
					
						
						
						
						
							
						
						
							5685d14537 
							
						 
					 
					
						
						
							
							[CLOUDSTACK-6232] bridging allowed in isolated networks  
						
						 
						
						
						
						
					 
					
						2014-03-12 17:47:55 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daan Hoogland 
							
						 
					 
					
						
						
						
						
							
						
						
							1dc2bbdc37 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6231 allow for cidr list entry of more than 256 chars  
						
						 
						
						
						
						
					 
					
						2014-03-12 15:50:43 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							f2d4b4d60e 
							
						 
					 
					
						
						
							
							Use IAMService to populate group-account association for system/admin  
						
						 
						
						... 
						
						
						
						account to solve unit test failure. 
						
						
					 
					
						2014-03-11 16:31:03 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							8937434fce 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5986: Fix dnsmasq lease for VPC  
						
						 
						
						
						
						
					 
					
						2014-03-11 16:14:33 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							467986321a 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6047: Enable VR aggregation commands for VPC  
						
						 
						
						
						
						
					 
					
						2014-03-11 16:14:33 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							e7ad33c456 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6229: UI > Delete Host action > if hypervisor is XenServer, display 'The host has been deleted. Please eject the host from XenServer Pool'.  
						
						 
						
						
						
						
					 
					
						2014-03-11 15:15:17 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							3e097a0fb2 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5779: Clean up leftover VR script in Xen  
						
						 
						
						
						
						
					 
					
						2014-03-11 13:22:14 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							f45de30d1b 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6047: Enable VR aggregation commands for VR start/reboot  
						
						 
						
						
						
						
					 
					
						2014-03-11 13:04:26 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							b399c315a3 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6218: Serialize VR commands in VR resource  
						
						 
						
						
						
						
					 
					
						2014-03-11 11:58:56 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							b554d4ac1f 
							
						 
					 
					
						
						
							
							Fix issues found through FindBugs.  
						
						 
						
						
						
						
					 
					
						2014-03-11 11:49:48 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Mihaela Stoica 
							
						 
					 
					
						
						
						
						
							
						
						
							36558e4619 
							
						 
					 
					
						
						
							
							Corrected the value of label.no.grouping in the resource files. An extra backspace at the end of the string caused incorrect text to be shown in the Select view dropdown on Virtual Routers page: "(no grouping)\label.create.nfs.secondary.staging.storage=Create NFS Secondary Staging Store" instead of "(no grouping)"  
						
						 
						
						... 
						
						
						
						Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com> 
						
						
					 
					
						2014-03-11 11:25:18 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kishan Kavala 
							
						 
					 
					
						
						
						
						
							
						
						
							c63f43a9cc 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6122: Add LXC to supported hypervisor list for VPC  
						
						 
						
						
						
						
					 
					
						2014-03-11 23:49:28 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kishan Kavala 
							
						 
					 
					
						
						
						
						
							
						
						
							6d4b979c4d 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6122: LXC systemVms run on KVM. If they are not included in the VmState report, MS assumes that system Vms are not running. MS will stop these Vms and spin new ones. So on LXC hosts, KVM Vms also have to be included in the Vmlist  
						
						 
						
						
						
						
					 
					
						2014-03-11 23:49:28 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							415e4bffd6 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6226: UI > multi widget > dropdown field > translate option value.  
						
						 
						
						
						
						
					 
					
						2014-03-11 11:19:00 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Marcus Sorensen 
							
						 
					 
					
						
						
						
						
							
						
						
							c874e20c24 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6225: Check libvirt version and volume format before  
						
						 
						
						... 
						
						
						
						adding flag VIR_STORAGE_VOL_RESIZE_ALLOCATE to resize volume
libvirt call 
						
						
					 
					
						2014-03-11 11:13:12 -06:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								SrikanteswaraRao Talluri 
							
						 
					 
					
						
						
						
						
							
						
						
							991e1eb6b1 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6222: Fix the marvin config generator scripts to include  
						
						 
						
						... 
						
						
						
						new syntax changes in marvin code and fix the logFolderPath 
						
						
					 
					
						2014-03-11 16:09:01 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Rajesh Battala 
							
						 
					 
					
						
						
						
						
							
						
						
							540d020aa5 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6179 Execute VR commands on Virtual Resource when commands received to Hyper-V  
						
						 
						
						
						
						
					 
					
						2014-03-11 13:10:13 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Prachi Damle 
							
						 
					 
					
						
						
						
						
							
						
						
							1c85af3193 
							
						 
					 
					
						
						
							
							A production/QA Setup does not populate the admin and SYSTEM accounts during database setup. So IAM plugin needs to insert the necessary group <-> account map in the DB during startup  
						
						 
						
						
						
						
					 
					
						2014-03-10 17:30:00 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nitin Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							33a0dec965 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6221:  
						
						 
						
						... 
						
						
						
						Publish first class objects involved in an operation (for now vm uuid) on the event bus . Example -  during attach/detachIso along with iso id, vm id should be available as well. 
						
						
					 
					
						2014-03-10 16:22:34 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							466825a167 
							
						 
					 
					
						
						
							
							Fixed nonoss build  
						
						 
						
						
						
						
					 
					
						2014-03-10 15:29:18 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Marcus Sorensen 
							
						 
					 
					
						
						
						
						
							
						
						
							a4d3ec476f 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6220: Take 2, Fix cloudstack init scripts so that they  
						
						 
						
						... 
						
						
						
						don't use fully qualified path as script name. Fix for
    commit 9dd57c22b02afcddb1d6c8ddc3e1b578961454e3 
						
						
					 
					
						2014-03-10 16:11:52 -06:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Marcus Sorensen 
							
						 
					 
					
						
						
						
						
							
						
						
							d033ca486b 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6220: Fix cloudstack init scripts so that they  
						
						 
						
						... 
						
						
						
						don't use fully qualified path as script name. Fix for
commit 9dd57c22b02afcddb1d6c8ddc3e1b578961454e3 
						
						
					 
					
						2014-03-10 15:34:55 -06:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							bf9375b8b9 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6214: apply network rules when plug new guest nic to router for the network in Setup state  
						
						 
						
						... 
						
						
						
						Conflicts:
	server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManager.java
	server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
Conflicts:
	api/src/com/cloud/network/VpcVirtualNetworkApplianceService.java
	server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManager.java
	server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
	server/test/com/cloud/vpc/MockVpcVirtualNetworkApplianceManager.java 
						
						
					 
					
						2014-03-10 11:42:24 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							748c090b29 
							
						 
					 
					
						
						
							
							Fix unapproved licens issue.  
						
						 
						
						
						
						
					 
					
						2014-03-10 11:27:10 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Mike Tutkowski 
							
						 
					 
					
						
						
						
						
							
						
						
							1d74daf6fe 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6170  
						
						 
						
						
						
						
					 
					
						2014-03-10 11:43:54 -06:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							a1b778fc2c 
							
						 
					 
					
						
						
							
							Fix truncation issue with refresh, add button icons  
						
						 
						
						
						
						
					 
					
						2014-03-10 07:43:28 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daan Hoogland 
							
						 
					 
					
						
						
						
						
							
						
						
							d182a51162 
							
						 
					 
					
						
						
							
							findbugs: another array pointer in error message  
						
						 
						
						
						
						
					 
					
						2014-03-10 13:21:13 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daan Hoogland 
							
						 
					 
					
						
						
						
						
							
						
						
							e0d20fb6eb 
							
						 
					 
					
						
						
							
							findbugs: null check before use of pointer  
						
						 
						
						
						
						
					 
					
						2014-03-10 13:08:15 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daan Hoogland 
							
						 
					 
					
						
						
						
						
							
						
						
							579cb9c479 
							
						 
					 
					
						
						
							
							findbugs: output vlanids in errormessage instead of array object pointer  
						
						 
						
						
						
						
					 
					
						2014-03-10 13:04:10 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daan Hoogland 
							
						 
					 
					
						
						
						
						
							
						
						
							0aca7cfab6 
							
						 
					 
					
						
						
							
							unneeded imports removed  
						
						 
						
						
						
						
					 
					
						2014-03-10 10:56:37 +01:00