Vincent Bernat 
							
						 
					 
					
						
						
						
						
							
						
						
							2401eb927b 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7633: fix "Provides" in most LSB headers  
						
						... 
						
						
						
						In init.d scripts, the LSB header may specify what kind of service is
provided by an init script. If spaces are used, this means the init
script is providing several boot facilities. We fix that by using an
hyphen.
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com> 
						
						
					 
					
						2014-09-25 16:56:53 +02:00 
						 
				 
			
				
					
						
							
							
								Rohit Yadav 
							
						 
					 
					
						
						
						
						
							
						
						
							91fd8d7cd5 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7528: More verbose logging when sending alert fails  
						
						... 
						
						
						
						When sendAlert is called on an AlertManager impl, if it fails it logs that
something was wrong but does not log the body of the issue/error. This means
we tell the user/admin that there was an issue but don't share the "issue"
with them at all as the email alert fail (or that they were not initialized).
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit 885c02dbd8b40d654f4a84fca8474ff88bc7ca5e)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
Conflicts:
	server/src/com/cloud/alert/AlertManagerImpl.java
	usage/src/com/cloud/usage/UsageAlertManagerImpl.java 
						
						
					 
					
						2014-09-10 11:38:47 +02:00 
						 
				 
			
				
					
						
							
							
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							dc3f0cbc63 
							
						 
					 
					
						
						
							
							Improve the handling of the findbug exclude files  
						
						
						
						
					 
					
						2014-09-03 10:41:22 +02:00 
						 
				 
			
				
					
						
							
							
								Anthony Xu 
							
						 
					 
					
						
						
						
						
							
						
						
							90fe6d8087 
							
						 
					 
					
						
						
							
							removed trailing space  
						
						
						
						
					 
					
						2014-08-13 11:09:38 -07:00 
						 
				 
			
				
					
						
							
							
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							676b2d1569 
							
						 
					 
					
						
						
							
							Fix overflow before widening issues reported by Coverity  
						
						
						
						
					 
					
						2014-07-24 13:22:14 +02:00 
						 
				 
			
				
					
						
							
							
								Kishan Kavala 
							
						 
					 
					
						
						
						
						
							
						
						
							421d6029db 
							
						 
					 
					
						
						
							
							Remove cloud-server dependency for cloud-usage project  
						
						
						
						
					 
					
						2014-07-02 15:28:42 +05:30 
						 
				 
			
				
					
						
							
							
								Santhosh Edukulla 
							
						 
					 
					
						
						
						
						
							
						
						
							1c80185170 
							
						 
					 
					
						
						
							
							Fixed Resource Leaks, null dereferences, invalid value comparisons, invalid result set loop  
						
						... 
						
						
						
						Signed-off-by: Daan Hoogland <daan@onecht.net> 
						
						
					 
					
						2014-06-21 12:38:46 +02:00 
						 
				 
			
				
					
						
							
							
								Olivier Lemasle 
							
						 
					 
					
						
						
						
						
							
						
						
							a5902f1db4 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6850: Return cpu cores, cpu speed and memory in listUsageRecords  
						
						... 
						
						
						
						Signed-off-by: Sebastien Goasguen <runseb@gmail.com> 
						
						
					 
					
						2014-06-10 03:11:35 -04:00 
						 
				 
			
				
					
						
							
							
								Olivier Lemasle 
							
						 
					 
					
						
						
						
						
							
						
						
							303e6ffc1e 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6669: Fix support resize in usage server  
						
						... 
						
						
						
						Signed-off-by: Sebastien Goasguen <runseb@gmail.com> 
						
						
					 
					
						2014-06-07 04:45:44 -04:00 
						 
				 
			
				
					
						
							
							
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							703febc64b 
							
						 
					 
					
						
						
							
							Fix CID-1147052 Use try-with-resources to fix the leak  
						
						
						
						
					 
					
						2014-06-03 17:20:16 +02:00 
						 
				 
			
				
					
						
							
							
								Rajani Karuturi 
							
						 
					 
					
						
						
						
						
							
						
						
							bdde5335f9 
							
						 
					 
					
						
						
							
							FIXED CLOUDSTACK-6669 Support volume resize in usage server  
						
						
						
						
					 
					
						2014-05-30 15:03:02 +05:30 
						 
				 
			
				
					
						
							
							
								Harikrishna Patnala 
							
						 
					 
					
						
						
						
						
							
						
						
							14f1b96b51 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6466: cpu and ram is not getting updated correctly in usage_vm_instance table for usage type 2  
						
						
						
						
					 
					
						2014-05-05 11:50:48 +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 
						 
				 
			
				
					
						
							
							
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							ac00ab0087 
							
						 
					 
					
						
						
							
							Cleanup all mysql dependencies and set all to provided.  
						
						
						
						
					 
					
						2014-02-21 14:55:11 +01: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 
						 
				 
			
				
					
						
							
							
								Harikrishna Patnala 
							
						 
					 
					
						
						
						
						
							
						
						
							95fa931ff2 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5515: #cpu ,cpuspeed and ram is set to NULL in usage db(usage_vm_instance table) after vm stop and start Fixed populating usage event details in usage db on vm start/upgrade/dynamic_scale  
						
						
						
						
					 
					
						2013-12-30 12:20:33 +05:30 
						 
				 
			
				
					
						
							
							
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							c2baed665b 
							
						 
					 
					
						
						
							
							Moved the check-style.xml into the tools directory given that we're not using the project to reference the style any longer.  Fixed problems with eclipse complaining about copy-dependencies  
						
						
						
						
					 
					
						2013-12-20 17:21:34 -08:00 
						 
				 
			
				
					
						
							
							
								Daan Hoogland 
							
						 
					 
					
						
						
						
						
							
						
						
							2e91cbe1ae 
							
						 
					 
					
						
						
							
							rats  
						
						
						
						
					 
					
						2013-12-18 14:30:26 +01: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 
						 
				 
			
				
					
						
							
							
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							bd6f706b72 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5261: added support for Alert publishing via ROOT Admin API  
						
						... 
						
						
						
						Conflicts:
	engine/orchestration/src/com/cloud/agent/manager/AgentManagerImpl.java
	engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
	engine/storage/image/src/org/apache/cloudstack/storage/image/TemplateServiceImpl.java
	engine/storage/volume/src/org/apache/cloudstack/storage/datastore/provider/DefaultHostListener.java
	engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java
	plugins/hypervisors/hyperv/src/com/cloud/hypervisor/hyperv/discoverer/HypervServerDiscoverer.java
	plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareServerDiscoverer.java
	plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java
	server/src/com/cloud/alert/AlertManagerImpl.java
	server/src/com/cloud/alert/ConsoleProxyAlertAdapter.java
	server/src/com/cloud/alert/SecondaryStorageVmAlertAdapter.java
	server/src/com/cloud/configuration/ConfigurationManagerImpl.java
	server/src/com/cloud/ha/HighAvailabilityManagerExtImpl.java
	server/src/com/cloud/ha/HighAvailabilityManagerImpl.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
	server/src/com/cloud/resourcelimit/ResourceLimitManagerImpl.java
	server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java
	server/src/com/cloud/vm/UserVmManagerImpl.java
	usage/src/com/cloud/usage/UsageAlertManagerImpl.java
	usage/src/com/cloud/usage/UsageManagerImpl.java
listAlerts: introduced new parameter "name" to the alertResponse
Conflicts:
	api/src/org/apache/cloudstack/api/command/admin/resource/ListAlertsCmd.java
	server/src/com/cloud/alert/AlertManagerImpl.java
	usage/src/com/cloud/usage/UsageAlertManagerImpl.java
Added new Admin API - generateAlert. Available to ROOT admin only
Conflicts:
	api/src/org/apache/cloudstack/alert/AlertService.java
	api/src/org/apache/cloudstack/api/BaseCmd.java
	usage/src/com/cloud/usage/UsageAlertManagerImpl.java
listAlerts: implemented search by alert name
Conflicts:
	api/src/org/apache/cloudstack/alert/AlertService.java
	api/src/org/apache/cloudstack/api/command/admin/resource/ListAlertsCmd.java
	engine/schema/src/com/cloud/alert/AlertVO.java 
						
						
					 
					
						2013-12-04 10:05:46 -08:00 
						 
				 
			
				
					
						
							
							
								Bharat Kumar 
							
						 
					 
					
						
						
						
						
							
						
						
							68406ba29d 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5161 enable scaling of a vm using custom offering  
						
						... 
						
						
						
						Signed-off-by: Koushik Das <koushik@apache.org> 
						
						
					 
					
						2013-11-29 17:53:33 +05:30 
						 
				 
			
				
					
						
							
							
								Harikrishna Patnala 
							
						 
					 
					
						
						
						
						
							
						
						
							b2f0a0bce2 
							
						 
					 
					
						
						
							
							CLOUDSTACK-4737: handling usage events for dynamic compute offering  
						
						... 
						
						
						
						Signed-off-by: Koushik Das <koushik@apache.org> 
						
						
					 
					
						2013-11-26 17:07:30 +05:30 
						 
				 
			
				
					
						
							
							
								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 
							
						 
					 
					
						
						
						
						
							
						
						
							8d62744681 
							
						 
					 
					
						
						
							
							Reformat all source code.  Added checkstyle to check the source code  
						
						
						
						
					 
					
						2013-11-20 07:26:53 -08:00 
						 
				 
			
				
					
						
							
							
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							29aa4ae8da 
							
						 
					 
					
						
						
							
							Get rid of some errors and warnings in the server and usage sources  
						
						
						
						
					 
					
						2013-11-04 20:01:14 +01:00 
						 
				 
			
				
					
						
							
							
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							9d2271d115 
							
						 
					 
					
						
						
							
							Revert "fixed m2eclipse error" because it breaks packaging  
						
						... 
						
						
						
						This reverts commit 5bcd8280fdd1e9039a6bf6c4c4fd43b8b49f938e. 
						
						
					 
					
						2013-10-30 20:17:59 +01:00 
						 
				 
			
				
					
						
							
							
								Anthony Xu 
							
						 
					 
					
						
						
						
						
							
						
						
							5bcd8280fd 
							
						 
					 
					
						
						
							
							fixed m2eclipse error  
						
						
						
						
					 
					
						2013-10-29 15:20:49 -07:00 
						 
				 
			
				
					
						
							
							
								Darren Shepherd 
							
						 
					 
					
						
						
						
						
							
						
						
							f62e28c1ec 
							
						 
					 
					
						
						
							
							New Transaction API  
						
						... 
						
						
						
						Introduction of a new Transaction API that is more consistent with the style
of Spring's transaction managment.  The existing Transaction class was renamed
to TransactionLegacy.  All of the non-DAO code in the management server has been
updated to use the new Transaction API. 
						
						
					 
					
						2013-10-16 09:21:00 -07:00 
						 
				 
			
				
					
						
							
							
								Laszlo Hornyak 
							
						 
					 
					
						
						
						
						
							
						
						
							977a75f1be 
							
						 
					 
					
						
						
							
							UsageManagerInternal fix  
						
						... 
						
						
						
						aed5e9dc2a6882139bc38073923be5a3bacfd9d2 seems to inroduce some typo to run
Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com> 
						
						
					 
					
						2013-10-07 13:13:40 -07:00 
						 
				 
			
				
					
						
							
							
								Darren Shepherd 
							
						 
					 
					
						
						
						
						
							
						
						
							aed5e9dc2a 
							
						 
					 
					
						
						
							
							Add Manage Context framework  
						
						... 
						
						
						
						The managed context framework provides a simple way to add logic
to ACS at the various entry points of the system.  As threads are
launched and ran listeners can be registered for onEntry or onLeave
of the managed context.  This framework will be used specifically
to handle DB transaction checking and setting up the CallContext.
This framework is need to transition away from ACS custom AOP to
Spring AOP. 
						
						
					 
					
						2013-10-02 13:09:52 -07:00 
						 
				 
			
				
					
						
							
							
								Darren Shepherd 
							
						 
					 
					
						
						
						
						
							
						
						
							4590813836 
							
						 
					 
					
						
						
							
							Fix UsageServer startup  
						
						... 
						
						
						
						Add back @Component to ConfigurationDaoImpl and scan for the package in
Spring config. 
						
						
					 
					
						2013-10-01 10:30:36 -07:00 
						 
				 
			
				
					
						
							
							
								Kishan Kavala 
							
						 
					 
					
						
						
						
						
							
						
						
							b4464d88d3 
							
						 
					 
					
						
						
							
							CLOUDSTACK-4281 : Usage - exception was hiding the db error. Make the usage job fail incase of any DB insert exceptions  
						
						
						
						
					 
					
						2013-08-13 17:30:46 +05:30 
						 
				 
			
				
					
						
							
							
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							5495f10bce 
							
						 
					 
					
						
						
							
							Revert "Reverting the range of commits that broke the build"  
						
						... 
						
						
						
						This reverts commit b59e3aaefced03d40d5b4b63c421c69743bcd387. 
						
						
					 
					
						2013-08-08 15:02:40 -07:00 
						 
				 
			
				
					
						
							
							
								Prasanna Santhanam 
							
						 
					 
					
						
						
						
						
							
						
						
							b59e3aaefc 
							
						 
					 
					
						
						
							
							Reverting the range of commits that broke the build  
						
						... 
						
						
						
						This reverts commits 30c33415..f6a2c817bc
Signed-off-by: Prasanna Santhanam <tsp@apache.org> 
						
						
					 
					
						2013-08-08 14:46:56 +05:30 
						 
				 
			
				
					
						
							
							
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							942f282a6e 
							
						 
					 
					
						
						
							
							Moved config into it's own package  
						
						
						
						
					 
					
						2013-08-07 16:41:02 -07:00 
						 
				 
			
				
					
						
							
							
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							66cca4d9ac 
							
						 
					 
					
						
						
							
							Fixed up the pom.xml to use dependencies specified in cloudstack pom  
						
						
						
						
					 
					
						2013-08-02 13:51:47 -07:00 
						 
				 
			
				
					
						
							
							
								Chip Childers 
							
						 
					 
					
						
						
						
						
							
						
						
							8225374138 
							
						 
					 
					
						
						
							
							Updating pom.xml version numbers for release 4.3.0-SNAPSHOT  
						
						... 
						
						
						
						Signed-off-by: Chip Childers <chipchilders@apache.org> 
						
						
					 
					
						2013-08-01 10:35:00 -04:00 
						 
				 
			
				
					
						
							
							
								Mice Xia 
							
						 
					 
					
						
						
						
						
							
						
						
							51e4f597e0 
							
						 
					 
					
						
						
							
							fix CLOUDSTACK-3591 add usage recording for VM snapshots  
						
						... 
						
						
						
						Conflicts:
	plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
	server/src/com/cloud/vm/snapshot/VMSnapshotManagerImpl.java
	setup/db/db/schema-410to420.sql 
						
						
					 
					
						2013-08-01 10:47:36 +08:00 
						 
				 
			
				
					
						
							
							
								Harikrishna Patnala 
							
						 
					 
					
						
						
						
						
							
						
						
							2c53ede1de 
							
						 
					 
					
						
						
							
							CLOUDSTACK-3848: Usage events for dynamic scaling of cpu/ram operation on VM  
						
						
						
						
					 
					
						2013-07-31 15:07:17 +05:30 
						 
				 
			
				
					
						
							
							
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							a4cea4ebf2 
							
						 
					 
					
						
						
							
							Removed schema from the dependency of many components  
						
						
						
						
					 
					
						2013-07-29 10:55:19 -07:00 
						 
				 
			
				
					
						
							
							
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							c2752ba93c 
							
						 
					 
					
						
						
							
							Removed mysql as any dependency  
						
						
						
						
					 
					
						2013-07-26 20:35:48 -07:00 
						 
				 
			
				
					
						
							
							
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							f5e5b39c9b 
							
						 
					 
					
						
						
							
							Moved the DB layer code into framework-db and change only the necessary projects to refer to it.  Cut down on the dependencies introduced with all the code in utils.  
						
						
						
						
					 
					
						2013-07-26 15:02:10 -07:00 
						 
				 
			
				
					
						
							
							
								Saksham Srivastava 
							
						 
					 
					
						
						
						
						
							
						
						
							135a2e66c5 
							
						 
					 
					
						
						
							
							CLOUDSTACK-2508: Template usage should report both physical and virtual sizes  
						
						
						
						
					 
					
						2013-07-24 18:17:09 +05:30 
						 
				 
			
				
					
						
							
							
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							b18c72626b 
							
						 
					 
					
						
						
							
							Moved the SprintUtils which is for testing only to be in test directory.  Changed pom.xml for different projects to use the utils test-jar.  Removed some @Component annotations.  Moved majority of the dependencies from cloudstack pom to utils pom  
						
						
						
						
					 
					
						2013-07-18 21:53:51 -07:00 
						 
				 
			
				
					
						
							
							
								Kishan Kavala 
							
						 
					 
					
						
						
						
						
							
						
						
							f96442a45b 
							
						 
					 
					
						
						
							
							CLOUDSTACK-3231: Update service offering Id of allocated Vm usage whem service offering changes for a Vm  
						
						
						
						
					 
					
						2013-06-27 16:01:39 +05:30