Kishan Kavala 
							
						 
					 
					
						
						
						
						
							
						
						
							def9fd1f2e 
							
						 
					 
					
						
						
							
							remove finduser, findaccount, finddomain APIs  
						
						
						
						
					 
					
						2013-01-28 17:04:25 +05:30 
						 
				 
			
				
					
						
							
							
								Kishan Kavala 
							
						 
					 
					
						
						
						
						
							
						
						
							1f57d925eb 
							
						 
					 
					
						
						
							
							Apply API refactoring changes. Make changes to Regions API to work with new code  
						
						
						
						
					 
					
						2013-01-25 18:41:59 +05:30 
						 
				 
			
				
					
						
							
							
								Rohit Yadav 
							
						 
					 
					
						
						
						
						
							
						
						
							1425736c19 
							
						 
					 
					
						
						
							
							AccountManager: Add method to translate account type to role type  
						
						... 
						
						
						
						Signed-off-by: Rohit Yadav <bhaisaab@apache.org> 
						
						
					 
					
						2013-01-10 15:55:01 -08:00 
						 
				 
			
				
					
						
							
							
								Rohit Yadav 
							
						 
					 
					
						
						
						
						
							
						
						
							ed0637b8c2 
							
						 
					 
					
						
						
							
							api: Refactor move acl to org.apache.cloudstack  
						
						... 
						
						
						
						Signed-off-by: Rohit Yadav <bhaisaab@apache.org> 
						
						
					 
					
						2013-01-06 15:30:58 -08:00 
						 
				 
			
				
					
						
							
							
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							ebfb90e217 
							
						 
					 
					
						
						
							
							Create DB view for Account to speed up ListAccountsCmd, and add missing async job information for some response objects.  
						
						... 
						
						
						
						Signed-off-by: Min Chen <min.chen@citrix.com> 
						
						
					 
					
						2013-01-02 17:38:58 -08:00 
						 
				 
			
				
					
						
							
							
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							c167ad45e3 
							
						 
					 
					
						
						
							
							Move view based VO and Dao classes to cloud-server module to hide the  
						
						... 
						
						
						
						details from API client, also extract query related methods into
QueryService interface. 
						
						
					 
					
						2012-12-14 10:47:58 -08:00 
						 
				 
			
				
					
						
							
							
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							c83323fea7 
							
						 
					 
					
						
						
							
							api: Refactoring ListUsersCmd and UserResponse.  
						
						... 
						
						
						
						Signed-off-by: Rohit Yadav <bhaisaab@apache.org> 
						
						
					 
					
						2012-12-10 17:45:40 -08:00 
						 
				 
			
				
					
						
							
							
								Rohit Yadav 
							
						 
					 
					
						
						
						
						
							
						
						
							e398b1e47a 
							
						 
					 
					
						
						
							
							api: Refactor command and response classes to org.apache.cloudstack.api.*  
						
						... 
						
						
						
						Signed-off-by: Rohit Yadav <bhaisaab@apache.org> 
						
						
					 
					
						2012-12-07 19:23:24 -08:00 
						 
				 
			
				
					
						
							
							
								Rohit Yadav 
							
						 
					 
					
						
						
						
						
							
						
						
							af28c06998 
							
						 
					 
					
						
						
							
							api: move and group all under command, org.apache.cloudstack.command.*  
						
						... 
						
						
						
						Signed-off-by: Rohit Yadav <bhaisaab@apache.org> 
						
						
					 
					
						2012-12-07 18:30:54 -08:00 
						 
				 
			
				
					
						
							
							
								Rohit Yadav 
							
						 
					 
					
						
						
						
						
							
						
						
							e763fd7d36 
							
						 
					 
					
						
						
							
							api_refactor: move userkeys api to admin pkg  
						
						... 
						
						
						
						Signed-off-by: Rohit Yadav <bhaisaab@apache.org> 
						
						
					 
					
						2012-12-06 10:59:26 -08:00 
						 
				 
			
				
					
						
							
							
								Rohit Yadav 
							
						 
					 
					
						
						
						
						
							
						
						
							1b1d91dc4f 
							
						 
					 
					
						
						
							
							api_refactor: move admin level account apis to admin pkg  
						
						... 
						
						
						
						Signed-off-by: Rohit Yadav <bhaisaab@apache.org> 
						
						
					 
					
						2012-12-06 10:25:20 -08:00 
						 
				 
			
				
					
						
							
							
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							b0ce8fd4ff 
							
						 
					 
					
						
						
							
							api: Optimize and improve api, db call perfomance  
						
						... 
						
						
						
						This is part 1 of list API refactoring. Commands covered:
listVmsCmd, listRoutersCmd Response covered:
UserVmResponse, DomainRouterResponse. DB views created:
user_vm_view, domain_router_view.
Signed-off-by: Rohit Yadav <bhaisaab@apache.org> 
						
						
					 
					
						2012-12-05 20:06:20 -08:00 
						 
				 
			
				
					
						
							
							
								Rohit Yadav 
							
						 
					 
					
						
						
						
						
							
						
						
							ceddaf122c 
							
						 
					 
					
						
						
							
							api_refactor: refactor user apis  
						
						... 
						
						
						
						Signed-off-by: Rohit Yadav <bhaisaab@apache.org> 
						
						
					 
					
						2012-12-05 14:55:58 -08:00 
						 
				 
			
				
					
						
							
							
								Rohit Yadav 
							
						 
					 
					
						
						
						
						
							
						
						
							9a0df30766 
							
						 
					 
					
						
						
							
							api_refactor: refactor account apis  
						
						... 
						
						
						
						- Fix refactored apis, fix mappings in commands*.in
- Fix comments etc.
Signed-off-by: Rohit Yadav <bhaisaab@apache.org> 
						
						
					 
					
						2012-12-03 23:42:13 -08:00 
						 
				 
			
				
					
						
							
							
								Kishan Kavala 
							
						 
					 
					
						
						
						
						
							
						
						
							f0f33bf4da 
							
						 
					 
					
						
						
							
							Added Mock ApiServer, Regions API calls with api keys  
						
						
						
						
					 
					
						2012-10-17 14:16:36 +05:30 
						 
				 
			
				
					
						
							
							
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							8f2d9a09e5 
							
						 
					 
					
						
						
							
							CLOUDSTACK-332: intermediate checkin fixing count parameter in listCommands  
						
						... 
						
						
						
						Fixes the count in commands:
listVolumes
listVirtualMachines
listSnapshots
listRouters
listFirewallRules
listPortForwardingRules
listLoadBalancerRules
listIpForwardingRules
listAccounts
listUsers
listDomains
listDomainChildren
listPublicIpAddresses
listAlerts
listAsyncJobs
listRemoteAccessVpns
listVpnUsers
listTags
listPrivateGateways
listNetworkACLs
listStaticRoutes
Conflicts:
	api/src/com/cloud/api/commands/ListVMsCmd.java
	api/src/com/cloud/api/commands/ListVolumesCmd.java
	api/src/com/cloud/network/lb/LoadBalancingRulesService.java
	server/src/com/cloud/network/firewall/FirewallManagerImpl.java
	server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
	server/src/com/cloud/network/rules/RulesManagerImpl.java
	server/src/com/cloud/network/vpc/NetworkACLManagerImpl.java
	server/src/com/cloud/network/vpc/VpcManagerImpl.java
	server/src/com/cloud/network/vpn/RemoteAccessVpnManagerImpl.java
	server/src/com/cloud/tags/TaggedResourceManagerImpl.java 
						
						
					 
					
						2012-10-12 13:58:59 -07:00 
						 
				 
			
				
					
						
							
							
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							bda1e2d08d 
							
						 
					 
					
						
						
							
							VPC: more unittests for VpcService  
						
						... 
						
						
						
						Conflicts:
	server/src/com/cloud/network/vpc/VpcManagerImpl.java 
						
						
					 
					
						2012-08-07 11:37:36 -07:00 
						 
				 
			
				
					
						
							
							
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							c99b1d104a 
							
						 
					 
					
						
						
							
							Fixed broken unittest  
						
						
						
						
					 
					
						2012-07-24 10:30:39 -07:00 
						 
				 
			
				
					
						
							
							
								David Nalley 
							
						 
					 
					
						
						
						
						
							
						
						
							e87558256c 
							
						 
					 
					
						
						
							
							Patch from Chip Childers  
						
						... 
						
						
						
						https://reviews.apache.org/r/5704/ 
License header updates for the server folder 
					
						2012-07-02 09:51:21 -04:00 
						 
				 
			
				
					
						
							
							
								saksham 
							
						 
					 
					
						
						
						
						
							
						
						
							f6d16d0ab5 
							
						 
					 
					
						
						
							
							CS-15018: Event USER.LOGIN should contain the client IP address. Changes made in accordance with the coding convention.  
						
						... 
						
						
						
						Reviewed-by: Alena Prokharchyk 
						
						
					 
					
						2012-06-18 10:18:30 -07:00 
						 
				 
			
				
					
						
							
							
								frank 
							
						 
					 
					
						
						
						
						
							
						
						
							2f634c0913 
							
						 
					 
					
						
						
							
							Switch to Apache license  
						
						
						
						
					 
					
						2012-04-03 04:50:05 -07:00 
						 
				 
			
				
					
						
							
							
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							cad392cd68 
							
						 
					 
					
						
						
							
							bug 13335: fixed listProjectInvitations by projectId  
						
						... 
						
						
						
						status 13335: resolved fixed 
						
						
					 
					
						2012-02-07 13:16:27 -08:00 
						 
				 
			
				
					
						
							
							
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							8eed9004cd 
							
						 
					 
					
						
						
							
							Fixed broken unittest  
						
						
						
						
					 
					
						2012-01-27 14:44:34 -08:00 
						 
				 
			
				
					
						
							
							
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							83400cd15f 
							
						 
					 
					
						
						
							
							bug 12776: if there are multiple objects involved in resource creation, verify that they belong to the same account  
						
						... 
						
						
						
						status 12776: resolved fixed 
						
						
					 
					
						2012-01-17 13:40:37 -08:00 
						 
				 
			
				
					
						
							
							
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							f0c4980dff 
							
						 
					 
					
						
						
							
							bug 13110: use Ternary data structure when build search criteria  
						
						... 
						
						
						
						status 13110: resolved fixed 
						
						
					 
					
						2012-01-16 14:15:28 -08:00 
						 
				 
			
				
					
						
							
							
								Sheng Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							804cfaec46 
							
						 
					 
					
						
						
							
							Fix some testcases  
						
						
						
						
					 
					
						2012-01-11 13:51:43 -08:00 
						 
				 
			
				
					
						
							
							
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							c581506103 
							
						 
					 
					
						
						
							
							bug 12306: list* command revamp  
						
						
						
						
					 
					
						2012-01-09 10:07:42 -08:00 
						 
				 
			
				
					
						
							
							
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							6fd49a265c 
							
						 
					 
					
						
						
							
							Fixed unittest  
						
						
						
						
					 
					
						2011-12-27 15:34:54 -08:00 
						 
				 
			
				
					
						
							
							
								prachi 
							
						 
					 
					
						
						
						
						
							
						
						
							bab29c4207 
							
						 
					 
					
						
						
							
							Bug 12361  DB upgrade from 2.2 to Acton  
						
						... 
						
						
						
						- Changes to schema file schema-2214to30.sql: moved out cleanup to separate file, added some NAAS changes
- Added physicalNetwork setup to Upgrade2214to30.java data migration
- Unit test and sample file 
						
						
					 
					
						2011-12-10 00:01:15 +05:30 
						 
				 
			
				
					
						
							
							
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							102f460458 
							
						 
					 
					
						
						
							
							Fixed updateConfiguration - updateHostDetails used to swallow the exceptions  
						
						
						
						
					 
					
						2011-11-28 11:52:45 -08:00 
						 
				 
			
				
					
						
							
							
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							f9b31e895a 
							
						 
					 
					
						
						
							
							Fixed unittest  
						
						
						
						
					 
					
						2011-11-11 14:32:25 -08:00 
						 
				 
			
				
					
						
							
							
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							ddbcd01f56 
							
						 
					 
					
						
						
							
							fixed up unit test  
						
						
						
						
					 
					
						2011-11-11 14:15:13 -08:00 
						 
				 
			
				
					
						
							
							
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							f6fcaa49ec 
							
						 
					 
					
						
						
							
							Merge complete except for virtualnetworkappliancemanager  
						
						
						
						
					 
					
						2011-11-10 15:18:16 -08:00 
						 
				 
			
				
					
						
							
							
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							a32c4f1ec6 
							
						 
					 
					
						
						
							
							Fixed unit tests  
						
						
						
						
					 
					
						2011-11-03 14:02:53 -07:00 
						 
				 
			
				
					
						
							
							
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							b413a625f4 
							
						 
					 
					
						
						
							
							1) replaced joinProject API with updateProjectInvitation api. You can accept/decline the invitataion with this command  
						
						... 
						
						
						
						2) Added deleteProjectInviation command. Can be executed by project admin only 
						
						
					 
					
						2011-10-27 18:32:00 -07:00 
						 
				 
			
				
					
						
							
							
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							25c2734e03 
							
						 
					 
					
						
						
							
							More stuff to Projects feature - added support for adding resources (vms, templates, isos) to the project  
						
						
						
						
					 
					
						2011-10-05 13:24:25 -07:00 
						 
				 
			
				
					
						
							
							
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							998568283c 
							
						 
					 
					
						
						
							
							Don't allow to add accounts to the domain of type Project  
						
						... 
						
						
						
						Don't allow to manipulate (delete/update) accounts/domains of type Project 
						
						
					 
					
						2011-10-05 13:24:25 -07:00 
						 
				 
			
				
					
						
							
							
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							ccd47c1b21 
							
						 
					 
					
						
						
							
							Implemented Project Invitations  
						
						
						
						
					 
					
						2011-09-26 17:47:20 -07:00 
						 
				 
			
				
					
						
							
							
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							a1331d1cfc 
							
						 
					 
					
						
						
							
							Intermidiate checkin to Project feature:  
						
						... 
						
						
						
						1) Introduce new managers - ProjectManager and DomainManager. Moved all domain related code from AccountManager to DomainManager.
2) Moved some code from ManagementServerImpl to the correct managers.
3) New resource limit for Domain - Project 
						
						
					 
					
						2011-09-20 18:35:28 -07:00 
						 
				 
			
				
					
						
							
							
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							ba64010cb5 
							
						 
					 
					
						
						
							
							bug 11470: 1) fixed listResourceLimits 2) Fixed -1 to be treated as unlimited for all the resources  
						
						... 
						
						
						
						status 11470: resolved fixed 
						
						
					 
					
						2011-09-19 09:47:07 -07:00 
						 
				 
			
				
					
						
							
							
								alena 
							
						 
					 
					
						
						
						
						
							
						
						
							f6a79c603f 
							
						 
					 
					
						
						
							
							bug 11036: resource count update is refactored  
						
						... 
						
						
						
						status 11036: resolved fixed
1) Use row locks instead of global lock when update resource_count table. When update resource_count for account, make sure that we lock account+all related domains
2) Insert resource_count records for account/domain at the moment when account/domain is created.
3) As a part of DB upgrade, insert missing resource_count records for all non-removed accounts/domains
Conflicts:
	core/src/com/cloud/alert/AlertManager.java
	server/test/com/cloud/agent/MockAgentManagerImpl.java 
						
						
					 
					
						2011-09-13 10:47:36 -07:00 
						 
				 
			
				
					
						
							
							
								Chiradeep Vittal 
							
						 
					 
					
						
						
						
						
							
						
						
							3cb4ad4934 
							
						 
					 
					
						
						
							
							Add more detail when unable to schedule cleanup  
						
						... 
						
						
						
						clean up tests for security group manager v2
move interval to listener -- allows it to be configurable if needed
fix mocks
Enhanced logging for security group manager (from zucchini)
fix merge issues
merge issues 
						
						
					 
					
						2011-09-12 18:22:55 -07:00 
						 
				 
			
				
					
						
							
							
								Chiradeep Vittal 
							
						 
					 
					
						
						
						
						
							
						
						
							2fc782b8ba 
							
						 
					 
					
						
						
							
							Add basic Mocks for some managers  
						
						
						
						
					 
					
						2011-09-12 18:20:22 -07:00