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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							87381d4236 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5725: put origin flow context id into log4j context prefix to link jobs with the orchestration work flow in logging  
						
						 
						
						
						
						
					 
					
						2014-01-09 14:29:12 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							69f49839d3 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5726: Using runtime discovered dao (in AsyncJobManagerImpl.submitAsyncJob) to persist record has a problem to locate the right DAO instance, it causes corrupted field value be stored in database. Put in a work-around fix first to always initialize record fields in all cases  
						
						 
						
						
						
						
					 
					
						2014-01-09 14:29:12 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							832c8e4728 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5669: Always retrieve the most recent job result in OutComeImpl  
						
						 
						
						
						
						
					 
					
						2014-01-09 14:29:12 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							bf9a554522 
							
						 
					 
					
						
						
							
							CLOUDSTACK-669: covert VMsnapshot orchestration flows to make them be serialized with other VM operations  
						
						 
						
						
						
						
					 
					
						2014-01-09 14:29:12 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Harikrishna Patnala 
							
						 
					 
					
						
						
						
						
							
						
						
							fd0fabd3e2 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5551: Search not working for Configuration parameters in (Account/zone/cluster/storage) settings page  
						
						 
						
						... 
						
						
						
						Added filters while listing scoped configuration parameters.
Fixed: Some parameters are missing from UI settings tab because of missing scope entry in configuration table.
Signed-off-by: Koushik Das <koushik@apache.org> 
						
						
					 
					
						2014-01-02 16:18:21 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Damodar Reddy 
							
						 
					 
					
						
						
						
						
							
						
						
							9190b03056 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5457: DBHA features is broken due to RuntimeException thrown from underlying layer. Fixed my catching in ClusterManagerImpl  
						
						 
						
						... 
						
						
						
						Signed-off-by: Koushik Das <koushik@apache.org> 
						
						
					 
					
						2013-12-19 17:07:13 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							3c965d0685 
							
						 
					 
					
						
						
							
							CLOUDSTACK-669: convert volume attach/detach flows to make them be serialized with other VM operations  
						
						 
						
						
						
						
					 
					
						2013-12-18 16:14:07 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Antonio Fornie 
							
						 
					 
					
						
						
						
						
							
						
						
							55a6df4501 
							
						 
					 
					
						
						
							
							Resources leaks, refactoring and testing  
						
						 
						
						... 
						
						
						
						Removing resource leaks from UsageSanityChecker and
refactoring it (encapsulation, removal of copy and paste, constants...)
Modularize static method for closing Statments in TransactionLegacy
and reusing this new method from other classes (Upgrade2214to30)
Create Unit and Integration Tests for UsageSanityChecker
Add DBUnit cases and integration profile for nitegration tests as
a base for future DB tests 
						
						
					 
					
						2013-12-18 10:55:04 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							be5e5cc641 
							
						 
					 
					
						
						
							
							All Checkstyle problems corrected  
						
						 
						
						
						
						
					 
					
						2013-12-12 12:26:07 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							26c1ba296c 
							
						 
					 
					
						
						
							
							CLOUDSTACK-669: put user vm work under new vmsync model  
						
						 
						
						
						
						
					 
					
						2013-12-11 16:29:59 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								tuna 
							
						 
					 
					
						
						
						
						
							
						
						
							79a7ce871e 
							
						 
					 
					
						
						
							
							make SDN GRE work with XCP 1.6  
						
						 
						
						
						
						
					 
					
						2013-12-09 23:33:14 +07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								wilderrodrigues 
							
						 
					 
					
						
						
						
						
							
						
						
							226b193488 
							
						 
					 
					
						
						
							
							Fix for Coverity issues CID_1116744, CID_1116718 and CID_1116682, all related to resource leak  
						
						 
						
						... 
						
						
						
						Signed-off-by: Daan Hoogland <daan@onecht.net> 
						
						
					 
					
						2013-11-27 14:20:29 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								wilderrodrigues 
							
						 
					 
					
						
						
						
						
							
						
						
							d19688103b 
							
						 
					 
					
						
						
							
							Fixing coverity issues related to resource leak on FileInputStream being created anonymously  
						
						 
						
						... 
						
						
						
						Signed-off-by: Daan Hoogland <daan@onecht.net> 
						
						
					 
					
						2013-11-27 12:51:44 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							433a631916 
							
						 
					 
					
						
						
							
							Reformat of source code to set a stable base for the future.  I couldn't get checkstyle enabled.  There's still about a thousand errors from checkstyle.  Most of it from length errors from comments and strings.  Will attempt to remove those tonight.  This change is so large I just want to get it in before any merge nightmares.  The changes are fairly minor though and I did a full compile and start a server with the reformat code.  
						
						 
						
						
						
						
					 
					
						2013-11-21 07:56:47 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							cf715ff491 
							
						 
					 
					
						
						
							
							Bump 4.3.0 to 4.4.0 in master  
						
						 
						
						
						
						
					 
					
						2013-11-21 16:01:15 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							d620df2bdd 
							
						 
					 
					
						
						
							
							Reformatted all of the code.  
						
						 
						
						
						
						
					 
					
						2013-11-21 06:15:26 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							eaa250fd3c 
							
						 
					 
					
						
						
							
							Formatted again after all the tab expansions and eol removals  
						
						 
						
						
						
						
					 
					
						2013-11-21 04:47:01 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							224f479974 
							
						 
					 
					
						
						
							
							Removed trailing spaces  
						
						 
						
						
						
						
					 
					
						2013-11-21 04:08:01 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							e4b22d0fca 
							
						 
					 
					
						
						
							
							Replace all tabs, particularly the ones in the comments  
						
						 
						
						
						
						
					 
					
						2013-11-21 03:39:58 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							62e9273581 
							
						 
					 
					
						
						
							
							Removed trailing spaces  
						
						 
						
						
						
						
					 
					
						2013-11-21 03:12:05 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							278ef81a83 
							
						 
					 
					
						
						
							
							side-by-side VM sync management at manager level  
						
						 
						
						
						
						
					 
					
						2013-11-20 17:59:38 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							8d62744681 
							
						 
					 
					
						
						
							
							Reformat all source code.  Added checkstyle to check the source code  
						
						 
						
						
						
						
					 
					
						2013-11-20 07:26:53 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Laszlo Hornyak 
							
						 
					 
					
						
						
						
						
							
						
						
							065e5afa08 
							
						 
					 
					
						
						
							
							Tests for DBUtil  
						
						 
						
						... 
						
						
						
						This patch adds test for the lock management:
- getGlobalLock
- releaseGlobalLock
Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com> 
						
						
					 
					
						2013-11-16 15:44:31 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Harikrishna Patnala 
							
						 
					 
					
						
						
						
						
							
						
						
							c29cd9d3c7 
							
						 
					 
					
						
						
							
							CLOUDSTACK-4835: Update global configuration test cases failed in master Changes made in update/list configuration API to use ConfigDepot  
						
						 
						
						... 
						
						
						
						CLOUDSTACK-4169: Scoped configuraion parameters logic moved to ConfigDepot
CLOUDSTACK-5163: missing parameters in configuration table 
						
						
					 
					
						2013-11-15 12:19:31 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Damodar Reddy 
							
						 
					 
					
						
						
						
						
							
						
						
							67fc2f53e2 
							
						 
					 
					
						
						
							
							CLOUDSTACK-4916: Fixing the issue with DB HA when there are more than 2 db nodes (Issue was mysql DriverManager was returning salve db nodes on random basis which was causing issue)  
						
						 
						
						... 
						
						
						
						Signed-off-by: Abhinandan Prateek <aprateek@apache.org> 
						
						
					 
					
						2013-11-14 11:10:48 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Laszlo Hornyak 
							
						 
					 
					
						
						
						
						
							
						
						
							5420cbe981 
							
						 
					 
					
						
						
							
							added license header  
						
						 
						
						... 
						
						
						
						Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com> 
						
						
					 
					
						2013-11-12 08:09:37 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Laszlo Hornyak 
							
						 
					 
					
						
						
						
						
							
						
						
							f629d405eb 
							
						 
					 
					
						
						
							
							Test for DbUtil  
						
						 
						
						... 
						
						
						
						test cases for
- isPersistable
- getColumnName
Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com> 
						
						
					 
					
						2013-11-10 23:24:01 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Damodar Reddy 
							
						 
					 
					
						
						
						
						
							
						
						
							dcd3c44279 
							
						 
					 
					
						
						
							
							CLOUDSTACK-4916: To Enable Master High Availability using mysql connector params and mysql's 2 way replication  
						
						 
						
						... 
						
						
						
						Signed-off-by: Abhinandan Prateek <aprateek@apache.org> 
						
						
					 
					
						2013-11-08 16:18:14 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							dc3d279272 
							
						 
					 
					
						
						
							
							CLOUDSTACK-4833:[Automation][BVT] Template and ISO test cases failing  
						
						 
						
						... 
						
						
						
						from BVT suite, during LIST api call. 
						
						
					 
					
						2013-11-07 15:19:19 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							5cb3cd64e5 
							
						 
					 
					
						
						
							
							Fix CID 1116741,1116742 Resource leak  
						
						 
						
						
						
						
					 
					
						2013-11-07 16:23:20 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Darren Shepherd 
							
						 
					 
					
						
						
						
						
							
						
						
							24c0513eea 
							
						 
					 
					
						
						
							
							Add servlet filter class that is compatible with the Spring Modularization  
						
						 
						
						
						
						
					 
					
						2013-11-06 15:24:44 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							191dc80fa4 
							
						 
					 
					
						
						
							
							VM power state for job oritented sync processing  
						
						 
						
						
						
						
					 
					
						2013-11-05 19:00:37 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Darren Shepherd 
							
						 
					 
					
						
						
						
						
							
						
						
							80813375ae 
							
						 
					 
					
						
						
							
							Allow disabling modules and extensions from module.properties  
						
						 
						
						... 
						
						
						
						Discovery of modules is based on classpath scanning.  In some situations it
may not be possible or desirable to change the classpath.  To force a
module to not load you can create a file called modules.properties on the
classpath that can exclude specific modules from loading.  Additionally
this same file can be used to exclude a specific extension.  Extension
loading is typically done through global configuration.  If you want to set
up an environment and you don't even want the extension/module loaded on
the first start, then using the config file is appropriate.
Example: modules.properties
modules.exclude=storage-image-s3,storage-volume-solidfire
extensions.exclude=ClusterScopeStoragePoolAllocator,ZoneWideStoragePoolAllocator
Typically you would want to place this file in /etc/cloudstack/management 
						
						
					 
					
						2013-11-05 11:03:06 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							78b1ac4126 
							
						 
					 
					
						
						
							
							CLOUDSTACK-3868: fixed "count" param in listUsageRecords API to return the actual number of records matching the search criteria. Used to return the wrong value - the number of records per page  
						
						 
						
						... 
						
						
						
						Conflicts:
	server/src/com/cloud/usage/UsageServiceImpl.java
	utils/src/com/cloud/utils/db/GenericDaoBase.java 
						
						
					 
					
						2013-10-31 15:25:57 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Darren Shepherd 
							
						 
					 
					
						
						
						
						
							
						
						
							afaf6370dd 
							
						 
					 
					
						
						
							
							Fix change that broke db.properties.override  
						
						 
						
						
						
						
					 
					
						2013-10-31 09:21:34 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Darren Shepherd 
							
						 
					 
					
						
						
						
						
							
						
						
							1460196496 
							
						 
					 
					
						
						
							
							Centralize loading of db.properties to one place  
						
						 
						
						... 
						
						
						
						There is now a method DbProperites.getDbProperties() that will load the
db.properties in one place and do the proper decryption of values if needed 
						
						
					 
					
						2013-10-30 17:03:13 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Laszlo Hornyak 
							
						 
					 
					
						
						
						
						
							
						
						
							dbaa818d1e 
							
						 
					 
					
						
						
							
							InputStream use fix  
						
						 
						
						... 
						
						
						
						Closes the FileInputStream opened at configuration in
- ClusterManagerImpl
- ClusterServiceServletAdapter
- TransactionLegacy
- AsyncJobManagerImpl
- DBEncryptionUtil
- EncryptionSecretKeyChecker
Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com> 
						
						
					 
					
						2013-10-26 17:47:34 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Darren Shepherd 
							
						 
					 
					
						
						
						
						
							
						
						
							891b85d516 
							
						 
					 
					
						
						
							
							Add missing licenses  
						
						 
						
						
						
						
					 
					
						2013-10-23 15:20:08 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Darren Shepherd 
							
						 
					 
					
						
						
						
						
							
						
						
							76c22eae5b 
							
						 
					 
					
						
						
							
							Update to use new Transaction API  
						
						 
						
						
						
						
					 
					
						2013-10-23 11:23:18 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Darren Shepherd 
							
						 
					 
					
						
						
						
						
							
						
						
							e3280bdba2 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/spring-modularization'  
						
						 
						
						... 
						
						
						
						Conflicts:
	client/tomcatconf/applicationContext.xml.in
	client/tomcatconf/nonossComponentContext.xml.in
	client/tomcatconf/simulatorComponentContext.xml.in
	framework/db/src/com/cloud/utils/db/Transaction.java
	plugins/hypervisors/simulator/src/com/cloud/agent/manager/MockAgentManagerImpl.java
	server/src/com/cloud/api/ApiServer.java
	server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java 
						
						
					 
					
						2013-10-23 11:14:42 -07:00