Rohit Yadav 
							
						 
					 
					
						
						
						
						
							
						
						
							9555492b4d 
							
						 
					 
					
						
						
							
							Merge branch '4.9'  
						
						
						
						
					 
					
						2016-08-23 14:16:53 +05:30 
						 
				 
			
				
					
						
							
							
								Rohit Yadav 
							
						 
					 
					
						
						
						
						
							
						
						
							f13c224da1 
							
						 
					 
					
						
						
							
							Updating pom.xml version numbers for release 4.9.1.0-SNAPSHOT  
						
						... 
						
						
						
						Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com> 
						
						
					 
					
						2016-08-19 13:53:39 +05:30 
						 
				 
			
				
					
						
							
							
								Will Stevens 
							
						 
					 
					
						
						
						
						
							
						
						
							62aa3b2bfa 
							
						 
					 
					
						
						
							
							Updating pom.xml version numbers for release 4.10.0-SNAPSHOT  
						
						... 
						
						
						
						Signed-off-by: Will Stevens <williamstevens@gmail.com> 
						
						
					 
					
						2016-07-29 10:11:34 -04:00 
						 
				 
			
				
					
						
							
							
								Will Stevens 
							
						 
					 
					
						
						
						
						
							
						
						
							227ff3884d 
							
						 
					 
					
						
						
							
							Updating pom.xml version numbers for release 4.9.0  
						
						... 
						
						
						
						Signed-off-by: Will Stevens <williamstevens@gmail.com> 
						
						
					 
					
						2016-07-25 16:56:04 -04:00 
						 
				 
			
				
					
						
							
							
								Daan Hoogland 
							
						 
					 
					
						
						
						
						
							
						
						
							cb85b7e8be 
							
						 
					 
					
						
						
							
							CLOUDSTACK-9265 cleanup around httpclient versions  
						
						
						
						
					 
					
						2016-05-02 16:25:01 +02:00 
						 
				 
			
				
					
						
							
							
								Remi Bergsma 
							
						 
					 
					
						
						
						
						
							
						
						
							43ab98d823 
							
						 
					 
					
						
						
							
							Updating pom.xml version numbers for release 4.9.0-SNAPSHOT  
						
						... 
						
						
						
						Signed-off-by: Remi Bergsma <github@remi.nl> 
						
						
					 
					
						2016-01-26 15:12:20 +01:00 
						 
				 
			
				
					
						
							
							
								Remi Bergsma 
							
						 
					 
					
						
						
						
						
							
						
						
							32fcc47117 
							
						 
					 
					
						
						
							
							Updating pom.xml version numbers for release 4.8.1-SNAPSHOT  
						
						... 
						
						
						
						Signed-off-by: Remi Bergsma <github@remi.nl> 
						
						
					 
					
						2016-01-26 09:39:00 +01:00 
						 
				 
			
				
					
						
							
							
								Remi Bergsma 
							
						 
					 
					
						
						
						
						
							
						
						
							62f218b7bd 
							
						 
					 
					
						
						
							
							Updating pom.xml version numbers for release 4.8.0  
						
						... 
						
						
						
						Signed-off-by: Remi Bergsma <github@remi.nl> 
						
						
					 
					
						2016-01-20 23:43:35 +01:00 
						 
				 
			
				
					
						
							
							
								Remi Bergsma 
							
						 
					 
					
						
						
						
						
							
						
						
							8f5a2920e8 
							
						 
					 
					
						
						
							
							Updating pom.xml version numbers for release 4.8.0-SNAPSHOT  
						
						... 
						
						
						
						Signed-off-by: Remi Bergsma <github@remi.nl> 
						
						
					 
					
						2015-12-21 22:09:31 +01:00 
						 
				 
			
				
					
						
							
							
								cirstofolini 
							
						 
					 
					
						
						
						
						
							
						
						
							1a64c247ad 
							
						 
					 
					
						
						
							
							Removed unnecessary @Local annotations and their respective imports from the ComponentLifecycleBase class and its subclasses.  
						
						
						
						
					 
					
						2015-11-21 18:31:11 -02:00 
						 
				 
			
				
					
						
							
							
								Remi Bergsma 
							
						 
					 
					
						
						
						
						
							
						
						
							1f53f2a93e 
							
						 
					 
					
						
						
							
							Updating pom.xml version numbers for release 4.7.0-SNAPSHOT  
						
						... 
						
						
						
						Signed-off-by: Remi Bergsma <github@remi.nl> 
						
						
					 
					
						2015-11-15 18:54:13 +01:00 
						 
				 
			
				
					
						
							
							
								Rajani Karuturi 
							
						 
					 
					
						
						
						
						
							
						
						
							8bc0294014 
							
						 
					 
					
						
						
							
							Revert "Merge pull request  #714  from rafaelweingartner/master-lrg-cs-hackday-003"  
						
						... 
						
						
						
						This reverts commit cd7218e241a8ac93df7a73f938320487aa526de6, reversing
changes made to f5a7395cc2ec37364a2e210eac60720e9b327451.
Reason for Revert:
noredist build failed with the below error:
[ERROR] Failed to execute goal org.apache.maven.plugins:maven-compiler-plugin:3.2:compile (default-compile) on project cloud-plugin-hypervisor-vmware: Compilation failure
[ERROR] /home/jenkins/acs/workspace/build-master-noredist/plugins/hypervisors/vmware/src/com/cloud/hypervisor/guru/VMwareGuru.java:[484,12] error: non-static variable logger cannot be referenced from a static context
[ERROR] -> [Help 1]
even the normal build is broken as reported by @koushik-das on dev list
http://markmail.org/message/nngimssuzkj5gpbz  
						
						
					 
					
						2015-08-31 11:27:57 +05:30 
						 
				 
			
				
					
						
							
							
								Rafael Weingartner 
							
						 
					 
					
						
						
						
						
							
						
						
							3818257a68 
							
						 
					 
					
						
						
							
							Solved jira ticket: CLOUDSTACK-8750  
						
						
						
						
					 
					
						2015-08-28 22:35:08 -03:00 
						 
				 
			
				
					
						
							
							
								Wei Zhou 
							
						 
					 
					
						
						
						
						
							
						
						
							858b6c0251 
							
						 
					 
					
						
						
							
							Merge pull request  #730  from ustcweizhou/profiler-getDurationInMillis  
						
						... 
						
						
						
						CLOUDSTACK-8761: Replace some profiler.getDuration with profiler.getDurationInMillis after commit 5557ad55
This closes  #730  
						
						
					 
					
						2015-08-26 08:29:50 +02:00 
						 
				 
			
				
					
						
							
							
								Koushik Das 
							
						 
					 
					
						
						
						
						
							
						
						
							e7ddbd4980 
							
						 
					 
					
						
						
							
							Signed-off-by: Koushik Das <koushik@apache.org>  
						
						
						
						
					 
					
						2015-08-24 10:10:19 +05:30 
						 
				 
			
				
					
						
							
							
								Wei Zhou 
							
						 
					 
					
						
						
						
						
							
						
						
							662b478d45 
							
						 
					 
					
						
						
							
							Replace some profiler.getDuration with profiler.getDurationInMillis after commit 5557ad55  
						
						
						
						
					 
					
						2015-08-21 13:36:27 +02:00 
						 
				 
			
				
					
						
							
							
								Koushik Das 
							
						 
					 
					
						
						
						
						
							
						
						
							c989921fb7 
							
						 
					 
					
						
						
							
							CLOUDSTACK-8733: Host stuck in rebalancing state during agent LB  
						
						... 
						
						
						
						This is happening as ClusterServiceServletAdapter is started after ClusteredAgentManagerImpl.
Fix is to start ClusterServiceServletAdapter before ClusteredAgentManagerImpl. 
						
						
					 
					
						2015-08-14 17:11:52 +05:30 
						 
				 
			
				
					
						
							
							
								Daan Hoogland 
							
						 
					 
					
						
						
						
						
							
						
						
							b060c66096 
							
						 
					 
					
						
						
							
							CLOUDSTACK-8656: dummy main removed  
						
						
						
						
					 
					
						2015-08-04 13:35:30 +02:00 
						 
				 
			
				
					
						
							
							
								Daan Hoogland 
							
						 
					 
					
						
						
						
						
							
						
						
							16330e92da 
							
						 
					 
					
						
						
							
							CLOUDSTACK-8656: silent close failure of clustering socket log as info  
						
						
						
						
					 
					
						2015-08-02 19:55:14 +02:00 
						 
				 
			
				
					
						
							
							
								Daan Hoogland 
							
						 
					 
					
						
						
						
						
							
						
						
							e2b6237464 
							
						 
					 
					
						
						
							
							CLOUDSTACK-8656: debug messages on interupted exceptions  
						
						
						
						
					 
					
						2015-07-30 16:03:10 +02:00 
						 
				 
			
				
					
						
							
							
								wilderrodrigues 
							
						 
					 
					
						
						
						
						
							
						
						
							916aead9ab 
							
						 
					 
					
						
						
							
							Using Profiler class, from the utils package, instead of System.currentTimeMillis()  
						
						... 
						
						
						
						Signed-off-by: wilderrodrigues <wrodrigues@schubergphilis.com>
This closes  #525  
						
						
					 
					
						2015-06-25 09:14:23 +02:00 
						 
				 
			
				
					
						
							
							
								wilderrodrigues 
							
						 
					 
					
						
						
						
						
							
						
						
							212ae884a1 
							
						 
					 
					
						
						
							
							Formatting class ClusterServiceServletImpl  
						
						... 
						
						
						
						- Splitting format commit from fix commit.
Signed-off-by: wilderrodrigues <wrodrigues@schubergphilis.com> 
						
						
					 
					
						2015-06-25 09:14:23 +02:00 
						 
				 
			
				
					
						
							
							
								wilderrodrigues 
							
						 
					 
					
						
						
						
						
							
						
						
							e4f7fb74ef 
							
						 
					 
					
						
						
							
							Using Profiler class, from the utils package, instead of System.currentTimeMillis()  
						
						... 
						
						
						
						Signed-off-by: wilderrodrigues <wrodrigues@schubergphilis.com>
This closes  #524  
						
						
					 
					
						2015-06-25 09:13:46 +02:00 
						 
				 
			
				
					
						
							
							
								wilderrodrigues 
							
						 
					 
					
						
						
						
						
							
						
						
							ea1f2eb049 
							
						 
					 
					
						
						
							
							Formatting class ClusterManagerImpl  
						
						... 
						
						
						
						- Splitting format commit from fix commit.
Signed-off-by: wilderrodrigues <wrodrigues@schubergphilis.com> 
						
						
					 
					
						2015-06-25 09:13:46 +02:00 
						 
				 
			
				
					
						
							
							
								Rafael da Fonseca 
							
						 
					 
					
						
						
						
						
							
						
						
							eeeb2bb31d 
							
						 
					 
					
						
						
							
							Fix findbugs warning in ClusterManagerImpl.java ManagementServerHostDao.findByMsid takes long as input, and a boxed Long was being created for it  
						
						... 
						
						
						
						Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
This closes  #420  
						
						
					 
					
						2015-06-15 12:09:29 +03:00 
						 
				 
			
				
					
						
							
							
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							67113ff0b2 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7946:  
						
						... 
						
						
						
						remove leftover state in volume and snapshot table in case of mgt server
shutdown during storage operation.
Reviewed-by: Min 
						
						
					 
					
						2014-11-19 16:06:37 -08:00 
						 
				 
			
				
					
						
							
							
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							4ebaf0a583 
							
						 
					 
					
						
						
							
							Bump master version to 4.6.0-SNAPSHOT after branching 4.5.0-SNAPSHOT  
						
						
						
						
					 
					
						2014-10-29 14:54:23 +01:00 
						 
				 
			
				
					
						
							
							
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							dc3f0cbc63 
							
						 
					 
					
						
						
							
							Improve the handling of the findbug exclude files  
						
						
						
						
					 
					
						2014-09-03 10:41:22 +02:00 
						 
				 
			
				
					
						
							
							
								Koushik Das 
							
						 
					 
					
						
						
						
						
							
						
						
							aacf8ef77b 
							
						 
					 
					
						
						
							
							Findbugs fixes in cloud-utils project and a few other places  
						
						
						
						
					 
					
						2014-07-15 14:23:17 +05:30 
						 
				 
			
				
					
						
							
							
								Anthony Xu 
							
						 
					 
					
						
						
						
						
							
						
						
							388210c8f9 
							
						 
					 
					
						
						
							
							Add more logs for MS cluster manager  
						
						
						
						
					 
					
						2014-07-11 17:39:40 -07:00 
						 
				 
			
				
					
						
							
							
								Santhosh Edukulla 
							
						 
					 
					
						
						
						
						
							
						
						
							1f3d02b38a 
							
						 
					 
					
						
						
							
							Reverting the changes done to this file for coverity fixes  
						
						
						
						
					 
					
						2014-07-10 23:35:27 +05:30 
						 
				 
			
				
					
						
							
							
								Santhosh Edukulla 
							
						 
					 
					
						
						
						
						
							
						
						
							d51e8f44ae 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7079: Fixed the issue where rollback was called after commit. As well, added few null checks  
						
						
						
						
					 
					
						2014-07-09 15:58:43 +05:30 
						 
				 
			
				
					
						
							
							
								Likitha Shetty 
							
						 
					 
					
						
						
						
						
							
						
						
							4f969057b2 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7030. After the restart of MS in a clustered MS pool, not all hung worker VMs are recycled.  
						
						... 
						
						
						
						Recycle worker VMs that originally belonged to other management servers too because in case of MS restart, the owner MS might change. 
						
						
					 
					
						2014-07-07 13:38:47 +05:30 
						 
				 
			
				
					
						
							
							
								Santhosh Edukulla 
							
						 
					 
					
						
						
						
						
							
						
						
							a600d8408e 
							
						 
					 
					
						
						
							
							Fixed Resource Leaks, null dereferences, few other issues reported by coverity  
						
						
						
						
					 
					
						2014-07-04 16:17:58 +05:30 
						 
				 
			
				
					
						
							
							
								Daan Hoogland 
							
						 
					 
					
						
						
						
						
							
						
						
							8b62b2cb92 
							
						 
					 
					
						
						
							
							findbugs: exclude known spiffy hacks a.k.a. false positives  
						
						
						
						
					 
					
						2014-03-28 14:28:10 +01:00 
						 
				 
			
				
					
						
							
							
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							4402685e11 
							
						 
					 
					
						
						
							
							Update master to 4.5.0-SNAPSHOT  
						
						
						
						
					 
					
						2014-03-14 14:55:26 +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 
						 
				 
			
				
					
						
							
							
								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 
						 
				 
			
				
					
						
							
							
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							be5e5cc641 
							
						 
					 
					
						
						
							
							All Checkstyle problems corrected  
						
						
						
						
					 
					
						2013-12-12 12:26:07 -08: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 
							
						 
					 
					
						
						
						
						
							
						
						
							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 
						 
				 
			
				
					
						
							
							
								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 
						 
				 
			
				
					
						
							
							
								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 
							
						 
					 
					
						
						
						
						
							
						
						
							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