Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							ba848087f8 
							
						 
					 
					
						
						
							
							Disable IAM feature from 4.4 release.  
						
						 
						
						
						
						
					 
					
						2014-05-22 18:27:08 -07: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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Murali Reddy 
							
						 
					 
					
						
						
						
						
							
						
						
							6f2a193b7c 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6720: Async job events are not published on event bus  
						
						 
						
						... 
						
						
						
						fix ensures publishOnEventBus() is called on submit, update, complete
phase of job procesing 
						
						
					 
					
						2014-05-20 17:13:58 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							521ac796dd 
							
						 
					 
					
						
						
							
							Move EventBus hookup on job framework to ApiServer to decouple job framework away from business logic related hookups. The decoupling is done through internal messaging facility provided inside management server.  
						
						 
						
						
						
						
					 
					
						2014-05-06 15:48:22 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nitin Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							1d45b75298 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6499:  
						
						 
						
						... 
						
						
						
						Made changes so that uploading custom certificate works for ssvm.
    1. Reboot ssvm only when private key is passed meaning the server cert is passed. This is because while uploading the server cert is the last to be uploaded. And we want to propagate the entire chain once uploading is done.
    2. Change the SecStorageSetupCommand sent to ssvm so that it also carries the root cert apart from having the chain and the server cert and key.
    3. Change ssvm agent code to be able to configure root cert to the java key store.
    4. Change ssvm configure ssl script to insert the chain certs correctly.
    5. Fix order of chain certificates for apache webserver in SSVM
    6. Remove double encoding and decoding for uploadCustomCertificate API from UI and server code respectively, so that API call without UI works fine
    7. Java 1.7 - disable using SNI since copyTemplate doesnt work for SSL. 
						
						
					 
					
						2014-04-24 17:27:02 -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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ding Yuan 
							
						 
					 
					
						
						
						
						
							
						
						
							c031eb7d38 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6242: exception handling improvements  
						
						 
						
						... 
						
						
						
						Signed-off-by: Daan Hoogland <daan@onecht.net> 
						
						
					 
					
						2014-04-15 08:07:15 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							cd8801f6f7 
							
						 
					 
					
						
						
							
							Do app-level iteration to avoid mysql deadlocks  
						
						 
						
						
						
						
					 
					
						2014-04-02 15:46:50 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							66486d4322 
							
						 
					 
					
						
						
							
							BUG-ID: CS-19697: Deal with possible DB deadlock issue, return the job into queue for next turn  
						
						 
						
						
						
						
					 
					
						2014-04-02 14:59:04 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							b6cc6dd8e3 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6305: protect lock leaking from unhandled exception  
						
						 
						
						
						
						
					 
					
						2014-03-28 15:30:07 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Laszlo Hornyak 
							
						 
					 
					
						
						
						
						
							
						
						
							54c83c168f 
							
						 
					 
					
						
						
							
							removed redundant Integer instantiation in GenericDaoBase  
						
						 
						
						... 
						
						
						
						Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com> 
						
						
					 
					
						2014-03-28 18:40:25 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daan Hoogland 
							
						 
					 
					
						
						
						
						
							
						
						
							8b62b2cb92 
							
						 
					 
					
						
						
							
							findbugs: exclude known spiffy hacks a.k.a. false positives  
						
						 
						
						
						
						
					 
					
						2014-03-28 14:28:10 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							ec01791936 
							
						 
					 
					
						
						
							
							Fix the missing java imports from automatic merge  
						
						 
						
						
						
						
					 
					
						2014-03-14 14:22:23 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							12f7cbcb76 
							
						 
					 
					
						
						
							
							Deal with concurrent state update for VM and Host objects.  
						
						 
						
						
						
						
					 
					
						2014-03-14 14:07:39 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							4402685e11 
							
						 
					 
					
						
						
							
							Update master to 4.5.0-SNAPSHOT  
						
						 
						
						
						
						
					 
					
						2014-03-14 14:55:26 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							5310e66f30 
							
						 
					 
					
						
						
							
							Do not use row lock in sync-queue scheduling to work around mysql locking issues.  
						
						 
						
						
						
						
					 
					
						2014-03-13 16:59:56 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							8e27120be4 
							
						 
					 
					
						
						
							
							Seperate job executor pools to avoid thread starvation situation.  
						
						 
						
						
						
						
					 
					
						2014-03-13 16:59:56 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							84a528fad6 
							
						 
					 
					
						
						
							
							Merge branch 'master' into rbac  
						
						 
						
						
						
						
					 
					
						2014-03-13 14:52:37 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							90c485e5d6 
							
						 
					 
					
						
						
							
							Fixed some problems reported by FindBugs  
						
						 
						
						
						
						
					 
					
						2014-03-13 13:45:30 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							48e08fe676 
							
						 
					 
					
						
						
							
							Merge branch 'master' into rbac.  
						
						 
						
						
						
						
					 
					
						2014-03-06 14:02:20 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							5dd4fb22ef 
							
						 
					 
					
						
						
							
							Remove cancelled jobs from job monitoring, correct mis-calculated time-unit in job cancellation.  
						
						 
						
						
						
						
					 
					
						2014-03-03 17:44:58 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							b21662f890 
							
						 
					 
					
						
						
							
							make sure XS report VM state even if there is no running VM on the host.  
						
						 
						
						
						
						
					 
					
						2014-02-28 15:35:59 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							537bf7ced1 
							
						 
					 
					
						
						
							
							add job path to help associate an API job to related internal job. Reviewed-By: Self  
						
						 
						
						
						
						
					 
					
						2014-02-28 15:35:59 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							a8c9238d3d 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6065: Fix NPE problem caused by the lack of context setup in threads from agent manager thread pool  
						
						 
						
						
						
						
					 
					
						2014-02-28 15:35:59 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							441be43b8c 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5358: Bring back concurrency control in sync-queue management  
						
						 
						
						
						
						
					 
					
						2014-02-28 15:35:57 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							a0f932437c 
							
						 
					 
					
						
						
							
							Move mysql ha strategy to a plugin. Activate this plugin using the mysqlha profile or the noredist flag  
						
						 
						
						
						
						
					 
					
						2014-02-27 09:51:02 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							ac00ab0087 
							
						 
					 
					
						
						
							
							Cleanup all mysql dependencies and set all to provided.  
						
						 
						
						
						
						
					 
					
						2014-02-21 14:55:11 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							19b15a1bdc 
							
						 
					 
					
						
						
							
							Fix parameter index in getCount function.  
						
						 
						
						
						
						
					 
					
						2014-02-20 15:13:29 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							f1139848e5 
							
						 
					 
					
						
						
							
							Slight optimization, don't run checkstyle on container or non-java projects.  
						
						 
						
						
						
						
					 
					
						2014-02-18 12:24:11 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							443acac927 
							
						 
					 
					
						
						
							
							Fix functional issue introduced by some findbug changes.  
						
						 
						
						
						
						
					 
					
						2014-02-14 18:37:47 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							97bad4f9b3 
							
						 
					 
					
						
						
							
							Fix checkstyle and license issues  
						
						 
						
						
						
						
					 
					
						2014-02-14 18:37:47 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Antonio Fornie 
							
						 
					 
					
						
						
						
						
							
						
						
							cbea6d26e8 
							
						 
					 
					
						
						
							
							Fix and test GroupBy SQL query creation  
						
						 
						
						... 
						
						
						
						Signed-off-by: Ian Southam <isoutham@schubergphilis.com>
Signed-off-by: Hugo Trippaers <htrippaers@schubergphilis.com> 
						
						
					 
					
						2014-02-14 18:37:46 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ian Southam 
							
						 
					 
					
						
						
						
						
							
						
						
							5a6ad11fa2 
							
						 
					 
					
						
						
							
							findbugs findings  
						
						 
						
						... 
						
						
						
						Signed-off-by: Hugo Trippaers <htrippaers@schubergphilis.com> 
						
						
					 
					
						2014-02-14 18:37:46 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							e0de79b170 
							
						 
					 
					
						
						
							
							Resource metadata: by default, all metadata is set with display=true (meaning that the detail is avaialble for display to the regular user). If admin wants to set a specific detail to be false, he has to specify it explicitly in addResourceDetail command  
						
						 
						
						
						
						
					 
					
						2014-02-10 12:05:59 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Prachi Damle 
							
						 
					 
					
						
						
						
						
							
						
						
							f84375442e 
							
						 
					 
					
						
						
							
							Merge branch 'master' into rbac  
						
						 
						
						... 
						
						
						
						Conflicts:
	api/src/org/apache/cloudstack/api/command/user/autoscale/ListAutoScaleVmProfilesCmd.java
	api/src/org/apache/cloudstack/api/command/user/volume/ResizeVolumeCmd.java
	plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/MockAccountManager.java
	server/src/com/cloud/api/ApiServer.java
	server/src/com/cloud/api/query/QueryManagerImpl.java
	server/src/com/cloud/template/TemplateAdapterBase.java
	setup/db/db/schema-430to440.sql
	tools/apidoc/gen_toc.py 
						
						
					 
					
						2014-02-04 12:07:32 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Laszlo Hornyak 
							
						 
					 
					
						
						
						
						
							
						
						
							dea320f7b9 
							
						 
					 
					
						
						
							
							RAT fix  
						
						 
						
						... 
						
						
						
						added license header to test 
						
						
					 
					
						2014-01-25 20:50:14 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Laszlo Hornyak 
							
						 
					 
					
						
						
						
						
							
						
						
							e4da3775c9 
							
						 
					 
					
						
						
							
							removed redundant Long, Short, Double, Float and Boolean instantiations  
						
						 
						
						... 
						
						
						
						- Added unit tests
- Added javadoc
Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com> 
						
						
					 
					
						2014-01-25 20:09:45 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							33cd1ab921 
							
						 
					 
					
						
						
							
							Merge branch 'master' into rbac  
						
						 
						
						
						
						
					 
					
						2014-01-22 11:23:51 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							7ab3e277c4 
							
						 
					 
					
						
						
							
							Cosmetics  
						
						 
						
						
						
						
					 
					
						2014-01-22 10:11:20 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							a0197006ef 
							
						 
					 
					
						
						
							
							Removed "host" config parameter definition from ClusterManager interface as it got moved to cloud-api package  
						
						 
						
						
						
						
					 
					
						2014-01-21 17:19:52 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							929fbabaa2 
							
						 
					 
					
						
						
							
							Merge branch 'master' into rbac.  
						
						 
						
						
						
						
					 
					
						2014-01-17 14:37:08 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							a9733b5df2 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5731: Use general instance type to categorize VM work jobs to correctly serialize VM operations  
						
						 
						
						
						
						
					 
					
						2014-01-17 11:55:14 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							14e399410b 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5696: fix a regression caused by out-of-band sync changes  
						
						 
						
						
						
						
					 
					
						2014-01-15 16:22:27 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							7164fc6e73 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5696: Fix sync issue with out-of-band changes  
						
						 
						
						
						
						
					 
					
						2014-01-15 13:11:02 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							68b8891c62 
							
						 
					 
					
						
						
							
							Removed all reminants of the IdentityService.  Created the KeysManager to move the management  
						
						 
						
						... 
						
						
						
						of keys out of management server 
						
						
					 
					
						2014-01-14 13:11:35 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							bae498c89e 
							
						 
					 
					
						
						
							
							Handle search of those entities without db view created using new ACL  
						
						 
						
						... 
						
						
						
						model. 
						
						
					 
					
						2014-01-13 21:55:56 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							bc1eec9f70 
							
						 
					 
					
						
						
							
							Fixed a missing package name  
						
						 
						
						
						
						
					 
					
						2014-01-09 16:48:19 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							5fb6edd684 
							
						 
					 
					
						
						
							
							Changed the package to name to org.apache.cloudstack  
						
						 
						
						
						
						
					 
					
						2014-01-09 16:12:26 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							ae8560b195 
							
						 
					 
					
						
						
							
							Moved security out into its own jar.  Will be adding more to it.  Fixed a few white space issues brought up by checkstyle in eclipse.  
						
						 
						
						
						
						
					 
					
						2014-01-09 16:12:25 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							a05d71a80c 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5752: Use pesudo job context when API dispather directly calls into orchestration flow  
						
						 
						
						
						
						
					 
					
						2014-01-09 14:29:13 -08:00