Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							e61dda7d82 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6890:createVPC invoked by admin does not observe start flag.  
						
						
						
						
					 
					
						2014-06-10 17:35:15 -07:00 
						 
				 
			
				
					
						
							
							
								Olivier Lemasle 
							
						 
					 
					
						
						
						
						
							
						
						
							a5902f1db4 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6850: Return cpu cores, cpu speed and memory in listUsageRecords  
						
						... 
						
						
						
						Signed-off-by: Sebastien Goasguen <runseb@gmail.com> 
						
						
					 
					
						2014-06-10 03:11:35 -04:00 
						 
				 
			
				
					
						
							
							
								Tim Mackey 
							
						 
					 
					
						
						
						
						
							
						
						
							a8212d9ef4 
							
						 
					 
					
						
						
							
							Cleanup of Xen and XenServer terms. Cloned xen plugin creating a xenserver plugin, then removed xen plugin  
						
						... 
						
						
						
						Signed-off-by: Tim Mackey <tmackey@gmail.com>
Signed-off-by: Sebastien Goasguen <runseb@gmail.com> 
						
						
					 
					
						2014-06-07 04:50:23 -04:00 
						 
				 
			
				
					
						
							
							
								Marcus Sorensen 
							
						 
					 
					
						
						
						
						
							
						
						
							7ce3034299 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6790: Disable PXE ROM for system vm nics  
						
						
						
						
					 
					
						2014-05-27 16:52:26 -06:00 
						 
				 
			
				
					
						
							
							
								Nitin Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							a8140ff58c 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6787: Event Bus - uuids missing in some cases due to various reasons  
						
						
						
						
					 
					
						2014-05-27 15:07:38 -07:00 
						 
				 
			
				
					
						
							
							
								Marcus Sorensen 
							
						 
					 
					
						
						
						
						
							
						
						
							96055058b0 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6785: changed async job param injectedjobid to customjobid and check for unique/uuid  
						
						
						
						
					 
					
						2014-05-27 15:23:12 -06:00 
						 
				 
			
				
					
						
							
							
								Marcus Sorensen 
							
						 
					 
					
						
						
						
						
							
						
						
							2a5bf65c78 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6785: Allow async jobs to supply an injectedjobid  
						
						
						
						
					 
					
						2014-05-27 15:23:02 -06:00 
						 
				 
			
				
					
						
							
							
								Rajani Karuturi 
							
						 
					 
					
						
						
						
						
							
						
						
							ce6a53e37b 
							
						 
					 
					
						
						
							
							Fixed CLOUDSTACK-6756: usage id is not being returned for an ip in deleted ip range  
						
						... 
						
						
						
						(cherry picked from commit a6ed48fc9c5f68b46f0d2e05adefc7263c4cd0d0)
Conflicts:
	setup/db/db/schema-430to440.sql 
						
						
					 
					
						2014-05-27 10:41:40 +05:30 
						 
				 
			
				
					
						
							
							
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							e4e8931389 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6745:DomainAdmin is not able to deploy Vm for users in his  
						
						... 
						
						
						
						domain/subdomain. 
						
						
					 
					
						2014-05-22 18:28:14 -07:00 
						 
				 
			
				
					
						
							
							
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							ba848087f8 
							
						 
					 
					
						
						
							
							Disable IAM feature from 4.4 release.  
						
						
						
						
					 
					
						2014-05-22 18:27:08 -07:00 
						 
				 
			
				
					
						
							
							
								Daan Hoogland 
							
						 
					 
					
						
						
						
						
							
						
						
							cd62aecb2f 
							
						 
					 
					
						
						
							
							conflict headers removed from comment  
						
						
						
						
					 
					
						2014-05-22 10:00:05 +02:00 
						 
				 
			
				
					
						
							
							
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							09ec127470 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6743: Use edge-triggering in MessageDetector to handle bogus wakeup gracefully. Level triggering plus bogus wakeup can cause a tight loop to spin  
						
						
						
						
					 
					
						2014-05-21 16:17:39 -07:00 
						 
				 
			
				
					
						
							
							
								Anthony Xu 
							
						 
					 
					
						
						
						
						
							
						
						
							df6ce24f43 
							
						 
					 
					
						
						
							
							if networkID is not specified, get one network with free ips.  
						
						
						
						
					 
					
						2014-05-21 14:33:52 -07:00 
						 
				 
			
				
					
						
							
							
								Nitin Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							667c8e7905 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6699: listResouceDetails - enhance it to list by (key,value) pair - allowed to Admin only.  
						
						
						
						
					 
					
						2014-05-18 23:21:37 -07:00 
						 
				 
			
				
					
						
							
							
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							8d9bdb19b4 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6675: updatePFRule - retrieve network sync object based on the PF rule id that is passed in to the call; not the public ip address  
						
						
						
						
					 
					
						2014-05-14 12:34:39 -07:00 
						 
				 
			
				
					
						
							
							
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							961e2c43bc 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6659: fixed the name for the updateIpAddress API command  
						
						
						
						
					 
					
						2014-05-14 12:34:36 -07:00 
						 
				 
			
				
					
						
							
							
								Sanjay Tripathi 
							
						 
					 
					
						
						
						
						
							
						
						
							35cd61c463 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6649: CS is not giving the system-wide capacity for GPU reosurce.  
						
						
						
						
					 
					
						2014-05-14 15:05:28 +05:30 
						 
				 
			
				
					
						
							
							
								Amogh Vasekar 
							
						 
					 
					
						
						
						
						
							
						
						
							9b6d430171 
							
						 
					 
					
						
						
							
							This patch disallows deleting / modifying system defined guest OS mappings  
						
						... 
						
						
						
						Local env
1. Create user defined mapping
2. Delete / modify user defined mapping. Should pass
3. Delete / modify system defined mapping. Should fail
Signed off by :- Nitin Mehta<nitin.mehta@citrix.com> 
						
						
					 
					
						2014-05-12 22:45:24 -07:00 
						 
				 
			
				
					
						
							
							
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							98307bfcea 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6647: appending instance name with custom supplied info that contains - character can break vmsync.  
						
						
						
						
					 
					
						2014-05-12 16:32:05 -07:00 
						 
				 
			
				
					
						
							
							
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							aa03af7df7 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6628: Fix IpAddress import typo.  
						
						
						
						
					 
					
						2014-05-12 12:08:41 -07:00 
						 
				 
			
				
					
						
							
							
								Nitin Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							7ae784ba3c 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6633: listVolumes should return template/iso info for root volumes  
						
						
						
						
					 
					
						2014-05-11 20:36:53 -07:00 
						 
				 
			
				
					
						
							
							
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							daadc45122 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6628:[Automation] Create PF rulw API failing with error  
						
						... 
						
						
						
						"database id can only provided by VO objects". 
						
						
					 
					
						2014-05-09 18:48:08 -07:00 
						 
				 
			
				
					
						
							
							
								Nitin Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							1e300b0d12 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6530: Make more networking entities implement Displayable interface.  
						
						
						
						
					 
					
						2014-05-09 10:13:33 -07:00 
						 
				 
			
				
					
						
							
							
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							0f79223f28 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6613:IAM: authorizeSecurityGroupIngress fails when SG Name is  
						
						... 
						
						
						
						passed. 
						
						
					 
					
						2014-05-08 23:19:28 -07:00 
						 
				 
			
				
					
						
							
							
								Nitin Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							c0f72b25c6 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6530: Make Network and Volume implement Displayable interface. Iterate over all first class entities in the context to decide the display property for event display.  
						
						
						
						
					 
					
						2014-05-08 15:37:20 -07:00 
						 
				 
			
				
					
						
							
							
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							b7b89b1297 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6601: added "forDisplay" parameter to listLoadBalancerRules API  
						
						
						
						
					 
					
						2014-05-07 17:06:55 -07:00 
						 
				 
			
				
					
						
							
							
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							66d5ebc657 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6596: UUID and display flag update support for LBStickinessPolicy and LBHealthCheckPolicy  
						
						
						
						
					 
					
						2014-05-07 15:46:18 -07:00 
						 
				 
			
				
					
						
							
							
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							25ab05a189 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6595: call expunge method marked with @ActionEvent from expunge thread context. So the action even EXPUNGE.VM is generated when vm is expunged by the thread.  
						
						
						
						
					 
					
						2014-05-07 15:46:10 -07:00 
						 
				 
			
				
					
						
							
							
								Nitin Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							5388d349a4 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6597: Updatevm - root admin should be allowed to change instance name  
						
						
						
						
					 
					
						2014-05-07 14:34:01 -07:00 
						 
				 
			
				
					
						
							
							
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							ee5f5591c7 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6585: added missing metadata support for LBStickiness/LBHealthcheck policies  
						
						
						
						
					 
					
						2014-05-06 17:13:50 -07:00 
						 
				 
			
				
					
						
							
							
								Ove Ewerlid 
							
						 
					 
					
						
						
						
						
							
						
						
							fc04e4b4ec 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6570 API breakage of the UpdateUser API call  
						
						
						
						
					 
					
						2014-05-06 23:43:41 +02:00 
						 
				 
			
				
					
						
							
							
								Jayapal 
							
						 
					 
					
						
						
						
						
							
						
						
							40836344de 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6578: Fixed issue in delete remote access vpn command  
						
						
						
						
					 
					
						2014-05-06 20:08:30 +05:30 
						 
				 
			
				
					
						
							
							
								Jayapal 
							
						 
					 
					
						
						
						
						
							
						
						
							11591582d5 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6364 Added ip address validation  
						
						... 
						
						
						
						Also updated to assign vm primary ip to lb rule when vmid is passed virtualmachineid
and vm id ip details in vmidipmap 
						
						
					 
					
						2014-05-06 20:08:30 +05:30 
						 
				 
			
				
					
						
							
							
								Harikrishna Patnala 
							
						 
					 
					
						
						
						
						
							
						
						
							2284a95e4f 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6463: password is not set for VMs created from password enabled template  
						
						
						
						
					 
					
						2014-05-05 11:48:35 +05:30 
						 
				 
			
				
					
						
							
							
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							3314e11b70 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6569: IAM - Regular user is able to listNetworks of another  
						
						... 
						
						
						
						user in the same domain , by passing account and domainId. 
						
						
					 
					
						2014-05-02 14:58:11 -07:00 
						 
				 
			
				
					
						
							
							
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							d7c5382c58 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6535: IAM:MS:API createVMSnapshot doesn't preserve access  
						
						... 
						
						
						
						rights. 
						
						
					 
					
						2014-05-01 15:57:28 -07:00 
						 
				 
			
				
					
						
							
							
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							09c9f8dfbd 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6443: [Automation] Two Test Cases failed on "test_volumes.py"  
						
						... 
						
						
						
						- AttributeError: VirtualMachine instance has no attribute 'hostid'. 
						
						
					 
					
						2014-05-01 15:57:28 -07:00 
						 
				 
			
				
					
						
							
							
								Rajani Karuturi 
							
						 
					 
					
						
						
						
						
							
						
						
							f4779b4d0c 
							
						 
					 
					
						
						
							
							Fixed CLOUDSTACK-6509 Cannot import multiple LDAP/AD users into a cloudstack account  
						
						... 
						
						
						
						Conflicts:
	api/src/com/cloud/user/AccountService.java
	plugins/user-authenticators/ldap/src/org/apache/cloudstack/api/command/LdapCreateAccountCmd.java
	plugins/user-authenticators/ldap/src/org/apache/cloudstack/api/command/LdapImportUsersCmd.java
Signed-off-by: Koushik Das <koushik@apache.org> 
						
						
					 
					
						2014-04-29 14:49:06 +05:30 
						 
				 
			
				
					
						
							
							
								Nitin Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							dd55095fd5 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6530: Populate the first class entities in the context to be available for publishing more information for the event bus, checking the displayable property etc.  
						
						... 
						
						
						
						(cherry picked from commit 3e7ea4e8d99a92872007f11a09ab87c8ba61e1da) 
						
						
					 
					
						2014-04-28 18:21:48 -07:00 
						 
				 
			
				
					
						
							
							
								Prachi Damle 
							
						 
					 
					
						
						
						
						
							
						
						
							9514c9e045 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6349: IAM - No error message presented to the user , when  
						
						... 
						
						
						
						invalid password is provided.
- AccountManager now works using accountId instead of accountType in
following methods too:
- isResourceDomainAdmin()
- isAdmin() 
						
						
					 
					
						2014-04-28 11:10:50 -07:00 
						 
				 
			
				
					
						
							
							
								Amogh Vasekar 
							
						 
					 
					
						
						
						
						
							
						
						
							78c683f568 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6437:  
						
						... 
						
						
						
						Add ability to distinguish between user defined and system defined guest OS and mappings
Add default mappings for XenServer
Local testing with
1. Add new guest OS by API
2. Add new guest OS mapping by API 
						
						
					 
					
						2014-04-25 13:10:10 -07:00 
						 
				 
			
				
					
						
							
							
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							1e0d6716ca 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6436: listResourceDetails - don't return entries set with display=false, by default  
						
						... 
						
						
						
						Conflicts:
	api/src/org/apache/cloudstack/api/command/user/volume/ListResourceDetailsCmd.java 
						
						
					 
					
						2014-04-24 14:35:46 -07:00 
						 
				 
			
				
					
						
							
							
								SrikanteswaraRao Talluri 
							
						 
					 
					
						
						
						
						
							
						
						
							d22adf943d 
							
						 
					 
					
						
						
							
							Merge branch 'marvin'  
						
						... 
						
						
						
						Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
Conflicts:
	test/integration/component/test_dynamic_compute_offering.py
	test/integration/smoke/test_deploy_vm.py
	test/integration/smoke/test_disk_offerings.py
	test/integration/smoke/test_volumes.py 
						
						
					 
					
						2014-04-23 11:45:43 +05:30 
						 
				 
			
				
					
						
							
							
								Nitin Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							b9799481a1 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6199: Revert the AsyncVm and AsyncVolume Cmd. There is a better way to check the display property of first class entities.  
						
						
						
						
					 
					
						2014-04-18 13:58:13 -07:00 
						 
				 
			
				
					
						
							
							
								Sanjay Tripathi 
							
						 
					 
					
						
						
						
						
							
						
						
							5eaf3be44a 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6447: Grid K120Q and K220Q vGPU types are missing in create service offering menu.  
						
						
						
						
					 
					
						2014-04-18 13:49:26 +05:30 
						 
				 
			
				
					
						
							
							
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							c25332fc46 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6429:distinguish the case where caller can see everything and  
						
						... 
						
						
						
						the case where caller cannot see anything. Also change behavior to
default isRecursive to false if not specified. 
						
						
					 
					
						2014-04-17 18:33:08 -07:00 
						 
				 
			
				
					
						
							
							
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							5d59fc7f5a 
							
						 
					 
					
						
						
							
							Fix RoleBasedQuerySelector to handle new listAll semantics. If  
						
						... 
						
						
						
						listAll=true, show all resources that caller (or impersonater) has
ListEntry access type; otherwise, show all resources that caller (or
impersonater) has UseEntry access type. 
						
						
					 
					
						2014-04-17 18:06:07 -07:00 
						 
				 
			
				
					
						
							
							
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							7796128372 
							
						 
					 
					
						
						
							
							Handle listAll flag in IAM buildAclSearchParameters.  
						
						
						
						
					 
					
						2014-04-17 18:05:44 -07:00 
						 
				 
			
				
					
						
							
							
								Prachi Damle 
							
						 
					 
					
						
						
						
						
							
						
						
							7819775bb8 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6330 [Automation] createRemoteAccessVpn call fails with access permission error  
						
						... 
						
						
						
						- Correcting the EntityType for PublicIpAddress entity
- Adding the EntityType in the @APICommand for *IPAddrCmds 
						
						
					 
					
						2014-04-17 17:54:57 -07:00 
						 
				 
			
				
					
						
							
							
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							da13165743 
							
						 
					 
					
						
						
							
							Change AccountManagerImpl.checkAccess to invoke SecurityChecker  
						
						... 
						
						
						
						interface that takes multiple controlled entities. 
						
						
					 
					
						2014-04-17 17:53:01 -07:00