Anthony Xu 
							
						 
					 
					
						
						
						
						
							
						
						
							90fe6d8087 
							
						 
					 
					
						
						
							
							removed trailing space  
						
						 
						
						
						
						
					 
					
						2014-08-13 11:09:38 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Rohit Yadav 
							
						 
					 
					
						
						
						
						
							
						
						
							f11dcf8ef5 
							
						 
					 
					
						
						
							
							ApiServletTest: Fix test, now login/logout have their own API/class  
						
						 
						
						... 
						
						
						
						Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com> 
						
						
					 
					
						2014-08-12 12:01:31 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Rajani Karuturi 
							
						 
					 
					
						
						
						
						
							
						
						
							736ff5f8e5 
							
						 
					 
					
						
						
							
							Fixed CLOUDSTACK-7303 [LDAP] while importing ldap users, update the user info if it already exists in cloudstack  
						
						 
						
						
						
						
					 
					
						2014-08-11 17:54:31 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							8b98cc2202 
							
						 
					 
					
						
						
							
							CS-19072: fixed broken pagination and count in listNetworkOfferings  
						
						 
						
						
						
						
					 
					
						2014-07-28 14:44:04 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daan Hoogland 
							
						 
					 
					
						
						
						
						
							
						
						
							7f14da6406 
							
						 
					 
					
						
						
							
							rats  
						
						 
						
						
						
						
					 
					
						2014-07-23 21:31:50 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daan Hoogland 
							
						 
					 
					
						
						
						
						
							
						
						
							b8112ac79e 
							
						 
					 
					
						
						
							
							highlevel 'unit'-test for refactoring of (Vpc)VirtualNetworkApplianceManagerImpl  
						
						 
						
						
						
						
					 
					
						2014-07-23 21:30:21 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Murali Reddy 
							
						 
					 
					
						
						
						
						
							
						
						
							9dc322d46f 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7144: No GSLB provider is available during assigning load  
						
						 
						
						... 
						
						
						
						balancing rule
this fix ensures any bean implementing GslbProvider interface are injected
into GlobalLoadBalancingRulesServiceImpl. 
						
						
					 
					
						2014-07-21 16:50:21 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daan Hoogland 
							
						 
					 
					
						
						
						
						
							
						
						
							3b76278b97 
							
						 
					 
					
						
						
							
							rvr4vpc: more interesting test  
						
						 
						
						
						
						
					 
					
						2014-07-17 15:32:03 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Likitha Shetty 
							
						 
					 
					
						
						
						
						
							
						
						
							d3e7b43ee9 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7119. [VMware] Don't allow VM reset when VM has snapshots.  
						
						 
						
						
						
						
					 
					
						2014-07-17 13:32:16 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daan Hoogland 
							
						 
					 
					
						
						
						
						
							
						
						
							27bc791746 
							
						 
					 
					
						
						
							
							rats  
						
						 
						
						
						
						
					 
					
						2014-07-17 09:23:03 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daan Hoogland 
							
						 
					 
					
						
						
						
						
							
						
						
							5b37c65577 
							
						 
					 
					
						
						
							
							oversimplified test fixed  
						
						 
						
						
						
						
					 
					
						2014-07-16 17:28:01 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daan Hoogland 
							
						 
					 
					
						
						
						
						
							
						
						
							cc37eb50cf 
							
						 
					 
					
						
						
							
							checkstyle: unused imports  
						
						 
						
						
						
						
					 
					
						2014-07-16 16:52:02 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daan Hoogland 
							
						 
					 
					
						
						
						
						
							
						
						
							799258662c 
							
						 
					 
					
						
						
							
							rvr4vpc simple test for deployRouter  
						
						 
						
						
						
						
					 
					
						2014-07-16 16:44:28 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							dbc7d80329 
							
						 
					 
					
						
						
							
							Aggregate command cleanup is not required for the virtual router as we  
						
						 
						
						... 
						
						
						
						already cleanup in the finish.
And consequently dies if somebody tries to test with assertions enabled. 
						
						
					 
					
						2014-07-16 16:24:54 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daan Hoogland 
							
						 
					 
					
						
						
						
						
							
						
						
							5ccd904e83 
							
						 
					 
					
						
						
							
							simple first test for backward compatibility testing in rvr4vpc work  
						
						 
						
						
						
						
					 
					
						2014-07-16 10:59:58 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jayapal 
							
						 
					 
					
						
						
						
						
							
						
						
							73b622c823 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7068: addIpToNicCmd changed to BaseAsyncCreate  
						
						 
						
						
						
						
					 
					
						2014-07-09 14:57:25 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nitin Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							0c9c5a71b4 
							
						 
					 
					
						
						
							
							CLOUDSTACK-4364: Restore VM - log a usage event for newly created volume  
						
						 
						
						
						
						
					 
					
						2014-06-30 14:41:37 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							cd0ef09344 
							
						 
					 
					
						
						
							
							Fix typo and add the right exception to the error map.  
						
						 
						
						
						
						
					 
					
						2014-06-25 15:51:28 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daan Hoogland 
							
						 
					 
					
						
						
						
						
							
						
						
							c79ab570b0 
							
						 
					 
					
						
						
							
							Revert "CLOUDSTACK-6967: Initial OVM3 drop"  
						
						 
						
						... 
						
						
						
						This reverts commit 8a485b9b59e4108e862022baf7477f768380b325. 
						
						
					 
					
						2014-06-24 10:24:01 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Funs 
							
						 
					 
					
						
						
						
						
							
						
						
							8a485b9b59 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6967: Initial OVM3 drop  
						
						 
						
						... 
						
						
						
						Signed-off-by: Sebastien Goasguen <runseb@gmail.com>
(cherry picked from commit ed47763e2525a21fa4578d199492462d0fb1c7ef)
Conflicts:
	api/src/com/cloud/network/NetworkService.java
	api/src/org/apache/cloudstack/api/ApiConstants.java
	api/src/org/apache/cloudstack/api/command/admin/usage/AddTrafficTypeCmd.java
	engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/SnapshotObject.java
	plugins/pom.xml
	server/src/com/cloud/network/NetworkServiceImpl.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
	server/test/com/cloud/vpc/MockNetworkManagerImpl.java
	ui/scripts/docs.js 
						
						
					 
					
						2014-06-23 12:39:10 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jayapal 
							
						 
					 
					
						
						
						
						
							
						
						
							cc98d44542 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6922: Updated events for firewall ingress and egress  
						
						 
						
						
						
						
					 
					
						2014-06-19 15:06:56 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Saksham Srivastava 
							
						 
					 
					
						
						
						
						
							
						
						
							f2464e4182 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6864: UploadSSlCert API requires double encoding of URL params  
						
						 
						
						
						
						
					 
					
						2014-06-12 10:35:47 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							ac1b4b0316 
							
						 
					 
					
						
						
							
							Fixed unittest  
						
						 
						
						
						
						
					 
					
						2014-06-05 18:37:56 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nitin Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							5393387bbd 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6599:  
						
						 
						
						... 
						
						
						
						1. Adding the missing Template/Volume URLs expiration functionality
2. Improvement - While deleting the volume during expiration use rm -rf as vmware now contains directoy
3. Improvement - Use standard Answer so that the error gets logged in case deletion of expiration link didnt work fine.
4. Improvement - In case of domain change, expire the old urls 
						
						
					 
					
						2014-05-30 10:48:42 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							8a1eed24b9 
							
						 
					 
					
						
						
							
							Fix AccountManager unit testcase.  
						
						 
						
						
						
						
					 
					
						2014-05-22 22:33:25 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							b259bccee7 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6742: listVolumes - As regularuser , able to list Vms and  
						
						 
						
						... 
						
						
						
						volumes of other users. 
						
						
					 
					
						2014-05-22 18:28:00 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							ba848087f8 
							
						 
					 
					
						
						
							
							Disable IAM feature from 4.4 release.  
						
						 
						
						
						
						
					 
					
						2014-05-22 18:27:08 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Anthony Xu 
							
						 
					 
					
						
						
						
						
							
						
						
							df6ce24f43 
							
						 
					 
					
						
						
							
							if networkID is not specified, get one network with free ips.  
						
						 
						
						
						
						
					 
					
						2014-05-21 14:33:52 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								root 
							
						 
					 
					
						
						
						
						
							
						
						
							4b89a45e57 
							
						 
					 
					
						
						
							
							CLOUDSTACK-3272 Latest changes to add global configuration parameters to control the publishing of events on the message bus  
						
						 
						
						
						
						
					 
					
						2014-05-07 10:09:03 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							7f595778ad 
							
						 
					 
					
						
						
							
							Fix compilation error due to cherry-pick CLOUDSTACK-6569.  
						
						 
						
						
						
						
					 
					
						2014-05-02 16:01:13 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Laszlo Hornyak 
							
						 
					 
					
						
						
						
						
							
						
						
							178240a7da 
							
						 
					 
					
						
						
							
							test for HighAvailabilityManagerImpl  
						
						 
						
						... 
						
						
						
						Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com> 
						
						
					 
					
						2014-05-02 21:22:43 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Laszlo Hornyak 
							
						 
					 
					
						
						
						
						
							
						
						
							726d8fc3fc 
							
						 
					 
					
						
						
							
							test for escapeHTML  
						
						 
						
						... 
						
						
						
						- test added
- StringBuffer replaced with StringBuilder
Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com> 
						
						
					 
					
						2014-05-02 21:19:49 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							a9072a6612 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6513: Optimize code by removing deprecated utility to  
						
						 
						
						... 
						
						
						
						QueryManagerImpl as private method just used for listTemplates and
listAffinityGroups to avoid misuse by new list APIs. 
						
						
					 
					
						2014-05-01 15:57:28 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Laszlo Hornyak 
							
						 
					 
					
						
						
						
						
							
						
						
							94ab870d42 
							
						 
					 
					
						
						
							
							null pointer dereference fix  
						
						 
						
						... 
						
						
						
						Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com> 
						
						
					 
					
						2014-04-29 21:46:16 +02: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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Laszlo Hornyak 
							
						 
					 
					
						
						
						
						
							
						
						
							fc68922286 
							
						 
					 
					
						
						
							
							Static resource compression  
						
						 
						
						... 
						
						
						
						- added compile time maven plugin to compress css and js files
- Added new StaticResourceServlet to serve the requests to static files, this replaces the tomcat DefaultServlet
- Tests
- mapping of the static resource servlet to css and js files
Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com> 
						
						
					 
					
						2014-04-28 21:10:18 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Laszlo Hornyak 
							
						 
					 
					
						
						
						
						
							
						
						
							ecec8d368d 
							
						 
					 
					
						
						
							
							autounboxing fix in ConfigurationManager  
						
						 
						
						... 
						
						
						
						Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com> 
						
						
					 
					
						2014-04-28 20:56:45 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							44ff7fea5f 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6513: IAM - Templates - When templates are listed with  
						
						 
						
						... 
						
						
						
						templatefilter="shared" is used , we see public templates also being
included in the list. This commit reverts listTemplates behavior to 4.3
old logic without using consistent interpretation of list parameters
adopted in new IAM model. 
						
						
					 
					
						2014-04-28 11:11:53 -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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Laszlo Hornyak 
							
						 
					 
					
						
						
						
						
							
						
						
							e24bf73a96 
							
						 
					 
					
						
						
							
							new testcase for AccountManagerImpl.deleteUserAccount  
						
						 
						
						... 
						
						
						
						Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com> 
						
						
					 
					
						2014-04-22 22:47:05 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Laszlo Hornyak 
							
						 
					 
					
						
						
						
						
							
						
						
							be8c6fe626 
							
						 
					 
					
						
						
							
							test for AccountManagerImpl  
						
						 
						
						... 
						
						
						
						- new test for disableUser
- unused code removed
- A redundant if branch removed - all branches are doing the same
Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com> 
						
						
					 
					
						2014-04-21 10:25:16 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							da13165743 
							
						 
					 
					
						
						
							
							Change AccountManagerImpl.checkAccess to invoke SecurityChecker  
						
						 
						
						... 
						
						
						
						interface that takes multiple controlled entities. 
						
						
					 
					
						2014-04-17 17:53:01 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Saksham Srivastava 
							
						 
					 
					
						
						
						
						
							
						
						
							eb195d0575 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6151: Local data disk with tag goes to the wrong local storage pool  
						
						 
						
						... 
						
						
						
						Signed-off-by: Koushik Das <koushik@apache.org> 
						
						
					 
					
						2014-04-16 16:19:08 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Antonio Fornie 
							
						 
					 
					
						
						
						
						
							
						
						
							f5ba020633 
							
						 
					 
					
						
						
							
							Fix: ParamGenericValidationWorker shouldn't be case sensitive  
						
						 
						
						... 
						
						
						
						Signed-off-by: Alena Prokharchyk <alena.prokharchyk@citrix.com> 
						
						
					 
					
						2014-04-14 10:05:19 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Marcus Sorensen 
							
						 
					 
					
						
						
						
						
							
						
						
							11f5bdd78d 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6191 Add support for specifying volume provisioning  
						
						 
						
						... 
						
						
						
						type (thin, sparse, fat) in disk/compute offerings.
Submitted-by: Yoshikazu Nojima <mail@ynojima.net>
Reviewed-by: Marcus Sorensen, Mike Tutowski 
						
						
					 
					
						2014-04-10 09:23:04 -06:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sanjay Tripathi 
							
						 
					 
					
						
						
						
						
							
						
						
							a195205d11 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6366: add vgpuTypes details  in vgpu_types table.  
						
						 
						
						
						
						
					 
					
						2014-04-09 18:23:50 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sanjay Tripathi 
							
						 
					 
					
						
						
						
						
							
						
						
							2ae9da8d47 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6357: Not able to select GPU card in case of GPU-passthrough.  
						
						 
						
						
						
						
					 
					
						2014-04-08 22:10:09 +05:30