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 
						 
				 
			
				
					
						
							
							
								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 
						 
				 
			
				
					
						
							
							
								Saksham Srivastava 
							
						 
					 
					
						
						
						
						
							
						
						
							135a2e66c5 
							
						 
					 
					
						
						
							
							CLOUDSTACK-2508: Template usage should report both physical and virtual sizes  
						
						
						
						
					 
					
						2013-07-24 18:17:09 +05:30 
						 
				 
			
				
					
						
							
							
								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 
						 
				 
			
				
					
						
							
							
								Wei Zhou 
							
						 
					 
					
						
						
						
						
							
						
						
							ab6bf0b209 
							
						 
					 
					
						
						
							
							fix disk I/O description mistake  
						
						
						
						
					 
					
						2013-06-11 00:09:05 +02:00 
						 
				 
			
				
					
						
							
							
								Wei Zhou 
							
						 
					 
					
						
						
						
						
							
						
						
							6de271c754 
							
						 
					 
					
						
						
							
							fix disk I/O description mistake  
						
						
						
						
					 
					
						2013-06-11 00:03:03 +02:00 
						 
				 
			
				
					
						
							
							
								Wei Zhou 
							
						 
					 
					
						
						
						
						
							
						
						
							76ce304411 
							
						 
					 
					
						
						
							
							CLOUDSTACK-2707: use executeBatch instead of persist in Usage Server  
						
						
						
						
					 
					
						2013-06-10 15:00:08 +02:00 
						 
				 
			
				
					
						
							
							
								Wei Zhou 
							
						 
					 
					
						
						
						
						
							
						
						
							b9b0168da4 
							
						 
					 
					
						
						
							
							CLOUDSTACK-1192: Add Disk I/O Statistics  
						
						
						
						
					 
					
						2013-06-01 08:00:48 +02:00 
						 
				 
			
				
					
						
							
							
								Wei Zhou 
							
						 
					 
					
						
						
						
						
							
						
						
							2e8d1264a2 
							
						 
					 
					
						
						
							
							CLOUDSTACK-2707: use executeBatch instead of persist when Usage Server createNetworkHelperEntry  
						
						
						
						
					 
					
						2013-05-28 09:43:23 +02:00 
						 
				 
			
				
					
						
							
							
								Mice Xia 
							
						 
					 
					
						
						
						
						
							
						
						
							5118e9e29f 
							
						 
					 
					
						
						
							
							1) fix CLOUDSTACK-2129 and CLOUDSTACK-2128  
						
						... 
						
						
						
						2) include nicId in network.offerings.assign/remove event
3) use publishUsageEvent instead of saveUsageEvent to track usageEvent 
						
						
					 
					
						2013-04-22 19:38:32 +08:00 
						 
				 
			
				
					
						
							
							
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							574e716352 
							
						 
					 
					
						
						
							
							CLOUDSTACK-2033 Fix usage server startup and logging  
						
						... 
						
						
						
						Properly implement the Daemon interface
Initialize logging when the usage server is started as a daemon
Fix a few minor startup and packaging items. 
						
						
					 
					
						2013-04-16 10:52:49 +02:00 
						 
				 
			
				
					
						
							
							
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							f8471e545f 
							
						 
					 
					
						
						
							
							CLOUDSTACK-1746: fix logging warning in usage server  
						
						
						
						
					 
					
						2013-03-29 13:44:12 -07:00 
						 
				 
			
				
					
						
							
							
								Anshul Gangwar 
							
						 
					 
					
						
						
						
						
							
						
						
							61754cd987 
							
						 
					 
					
						
						
							
							CLOUDSTACK-680: Feature SNMP Alerts support in CloudStack  
						
						... 
						
						
						
						Signed-off-by: Anshul Gangwar <anshul.gangwar@citrix.com>
Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org> 
						
						
					 
					
						2013-03-18 11:36:19 +05:30 
						 
				 
			
				
					
						
							
							
								Rohit Yadav 
							
						 
					 
					
						
						
						
						
							
						
						
							0a1a207a19 
							
						 
					 
					
						
						
							
							usage: Fix regression build fail from fc3905fb, missing closing parenthesis  
						
						... 
						
						
						
						We've to test our commits, build 'em before committing :)
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
(cherry picked from commit c47f685b1f323d1d8316ef6067c11cf14ecabbc6)
Signed-off-by: Rohit Yadav <bhaisaab@apache.org> 
						
						
					 
					
						2013-02-26 16:41:16 +05:30 
						 
				 
			
				
					
						
							
							
								Wei Zhou 
							
						 
					 
					
						
						
						
						
							
						
						
							fc3905fb57 
							
						 
					 
					
						
						
							
							CLOUDSTACK-962:setAggBytesSent/setAggBytesReceived in NetworkUsageTask when not in case of dailyor hourly  
						
						... 
						
						
						
						Removed duplicate userstatsdao injection 
						
						
					 
					
						2013-02-26 16:27:59 +05:30 
						 
				 
			
				
					
						
							
							
								Kishan Kavala 
							
						 
					 
					
						
						
						
						
							
						
						
							7d61ee6e99 
							
						 
					 
					
						
						
							
							CLOUDSTACK-1295 : Added usage unit tests  
						
						... 
						
						
						
						Fixed Component annontation for usage parsers
Fixed mvn target to run usage
removed UsageServerComponentConfig which is not required
Added region_id to account table in cloud_usage db
Conflicts:
	setup/db/db/schema-40to410.sql 
						
						
					 
					
						2013-02-15 18:41:28 +05:30 
						 
				 
			
				
					
						
							
							
								Kishan Kavala 
							
						 
					 
					
						
						
						
						
							
						
						
							fc0bf21a13 
							
						 
					 
					
						
						
							
							CLOUDSTACK-786, CLOUDSTACK-1014: Moved usage APIs to cloud-api. Removed ManagementServerExt. Usage API related implementation is added to UsageServiceImpl  
						
						
						
						
					 
					
						2013-02-05 16:49:34 +05:30 
						 
				 
			
				
					
						
							
							
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							7ce03b4f8e 
							
						 
					 
					
						
						
							
							Summary: Fixup usage server for packaging  
						
						... 
						
						
						
						Make the start method work again with jsvc
Move the usageApplicationContext to resources and add resources to the pom.xml
Remove the old components file
Add mysql-connector as a runtime dependency
Rename the usage package and the files to cloudstack
Change paths to the new proposed locations 
						
						
					 
					
						2013-02-03 17:49:18 +01:00 
						 
				 
			
				
					
						
							
							
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							176523254e 
							
						 
					 
					
						
						
							
							Improve component lifecycle management with system run-level concept  
						
						
						
						
					 
					
						2013-01-30 15:21:02 -08:00 
						 
				 
			
				
					
						
							
							
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							1450547987 
							
						 
					 
					
						
						
							
							Put usage server under Spring  
						
						
						
						
					 
					
						2013-01-25 23:00:55 -08:00 
						 
				 
			
				
					
						
							
							
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							6fb1a1e6f1 
							
						 
					 
					
						
						
							
							Fix issues after another round of merge  
						
						
						
						
					 
					
						2013-01-11 16:54:32 -08:00 
						 
				 
			
				
					
						
							
							
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							f922c6fc03 
							
						 
					 
					
						
						
							
							Keep removing  
						
						
						
						
					 
					
						2013-01-10 14:46:52 -08:00 
						 
				 
			
				
					
						
							
							
								Alex Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							56e5fbdee2 
							
						 
					 
					
						
						
							
							removed import of componentlocator and inject from all files  
						
						
						
						
					 
					
						2013-01-10 11:44:47 -08:00 
						 
				 
			
				
					
						
							
							
								Kelven Yang 
							
						 
					 
					
						
						
						
						
							
						
						
							b274c570f9 
							
						 
					 
					
						
						
							
							Cleanup places that use explicit wiring of the components  
						
						
						
						
					 
					
						2013-01-08 17:45:33 -08:00 
						 
				 
			
				
					
						
							
							
								Wido den Hollander 
							
						 
					 
					
						
						
						
						
							
						
						
							5d41523a0b 
							
						 
					 
					
						
						
							
							usage: Fix whitspace and indention according to code convention  
						
						... 
						
						
						
						Replaced all tabs by 4 spaces 
						
						
					 
					
						2012-09-13 16:29:01 +02:00 
						 
				 
			
				
					
						
							
							
								Wido den Hollander 
							
						 
					 
					
						
						
						
						
							
						
						
							eab3e4783e 
							
						 
					 
					
						
						
							
							Remove cloud-daemonize and use JSVC  
						
						... 
						
						
						
						We now use JSVC for daemonizing our agent and usage server. 
						
						
					 
					
						2012-07-24 19:32:39 +02:00 
						 
				 
			
				
					
						
							
							
								David Nalley 
							
						 
					 
					
						
						
						
						
							
						
						
							4cfbe5cf8b 
							
						 
					 
					
						
						
							
							fixing license headers for usage  
						
						
						
						
					 
					
						2012-06-04 10:22:57 -04:00 
						 
				 
			
				
					
						
							
							
								David Nalley 
							
						 
					 
					
						
						
						
						
							
						
						
							65d5d4d549 
							
						 
					 
					
						
						
							
							fixing line endings in usage  
						
						
						
						
					 
					
						2012-04-09 20:07:33 -04:00 
						 
				 
			
				
					
						
							
							
								frank 
							
						 
					 
					
						
						
						
						
							
						
						
							2f634c0913 
							
						 
					 
					
						
						
							
							Switch to Apache license  
						
						
						
						
					 
					
						2012-04-03 04:50:05 -07:00 
						 
				 
			
				
					
						
							
							
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							2e9511e2ae 
							
						 
					 
					
						
						
							
							Changed isElastic to isSystem for the publicIpAddress assigned during the vm deployment in EIP enabled network  
						
						... 
						
						
						
						Reviewed-by: Chiradeep 
						
						
					 
					
						2012-02-21 15:39:49 -08:00 
						 
				 
			
				
					
						
							
							
								kishan 
							
						 
					 
					
						
						
						
						
							
						
						
							ced6fd46b8 
							
						 
					 
					
						
						
							
							Bug 12954: Added usage for security groups. Usage will be generated for each security group that is assigned to a Vm.  
						
						... 
						
						
						
						Status 12954: resolved fixed
Reviewed-By: Nitin 
						
						
					 
					
						2012-02-17 13:50:18 +05:30 
						 
				 
			
				
					
						
							
							
								kishan 
							
						 
					 
					
						
						
						
						
							
						
						
							278833eb29 
							
						 
					 
					
						
						
							
							Bug 13420: Send alert of type 18 when sending alert for SSVM  
						
						... 
						
						
						
						Status 13420: resolved fixed
Reviewed-By: Nitin 
						
						
					 
					
						2012-02-08 18:50:42 +05:30 
						 
				 
			
				
					
						
							
							
								kishan 
							
						 
					 
					
						
						
						
						
							
						
						
							b15e5d6730 
							
						 
					 
					
						
						
							
							Bug 13326: Include isElastic flag in IPAddress usage response  
						
						... 
						
						
						
						Reviewed-By: Nitin 
						
						
					 
					
						2012-02-03 18:03:04 +05:30 
						 
				 
			
				
					
						
							
							
								kishan 
							
						 
					 
					
						
						
						
						
							
						
						
							a388ed792f 
							
						 
					 
					
						
						
							
							Bug 13326: Added is_elastic flag to IP address usage. Added new column in usage_ip_address, defaults to false. size column will contain is_elastic info in cloud_usage table  
						
						... 
						
						
						
						Status 13326: resolved fixed
Reviewed-By: Nitin 
						
						
					 
					
						2012-02-03 18:01:30 +05:30 
						 
				 
			
				
					
						
							
							
								kishan 
							
						 
					 
					
						
						
						
						
							
						
						
							fd182b806e 
							
						 
					 
					
						
						
							
							Bug 13143: Use defaults for timezone when config is null or empty  
						
						... 
						
						
						
						Status 13143: resolved fixed
Reviewed-By: Nitin 
						
						
					 
					
						2012-01-30 14:26:15 +05:30 
						 
				 
			
				
					
						
							
							
								kishan 
							
						 
					 
					
						
						
						
						
							
						
						
							52f940c007 
							
						 
					 
					
						
						
							
							bug 11961: Before creating template usage_storage records, check if entry already exists. In multiple secondary storage case, duplicate usage events will be ignored.  
						
						... 
						
						
						
						status 11961: resolved fixed
reviewed-by: Nitin 
						
						
					 
					
						2011-11-11 13:45:19 +05:30 
						 
				 
			
				
					
						
							
							
								kishan 
							
						 
					 
					
						
						
						
						
							
						
						
							18ef8ca3b4 
							
						 
					 
					
						
						
							
							bug 11173: Added usage for VPN users  
						
						... 
						
						
						
						status 11173: resolved fixed 
						
						
					 
					
						2011-11-01 17:01:48 +05:30 
						 
				 
			
				
					
						
							
							
								kishan 
							
						 
					 
					
						
						
						
						
							
						
						
							284ee3909e 
							
						 
					 
					
						
						
							
							bug 9842: Added task to update user stats agg bytes in sync with aggregation range  
						
						... 
						
						
						
						status 9842: resolved fixed 
						
						
					 
					
						2011-10-31 17:15:36 +05:30 
						 
				 
			
				
					
						
							
							
								David Nalley 
							
						 
					 
					
						
						
						
						
							
						
						
							15302b03da 
							
						 
					 
					
						
						
							
							restoring proper licensing notices originally committed in ad79436f2c304db27f5aee355527ffce18cf2590 but unintentionally reverted when trying to fix a few build issues  
						
						
						
						
					 
					
						2011-09-14 16:35:29 -04:00 
						 
				 
			
				
					
						
							
							
								David Nalley 
							
						 
					 
					
						
						
						
						
							
						
						
							639f25c259 
							
						 
					 
					
						
						
							
							fixing usage build in amster  
						
						
						
						
					 
					
						2011-09-14 15:29:48 -04:00 
						 
				 
			
				
					
						
							
							
								David Nalley 
							
						 
					 
					
						
						
						
						
							
						
						
							62157f2550 
							
						 
					 
					
						
						
							
							updating usage per convo with kishan and frank  
						
						
						
						
					 
					
						2011-09-13 14:23:18 -04:00 
						 
				 
			
				
					
						
							
							
								kishan 
							
						 
					 
					
						
						
						
						
							
						
						
							1b44c0c8f5 
							
						 
					 
					
						
						
							
							bug 11199: Added indexes to tables in cloud_usage DB in create-schema-premium.sql  
						
						... 
						
						
						
						status 11199: resolved fixed 
						
						
					 
					
						2011-09-13 17:57:21 +05:30 
						 
				 
			
				
					
						
							
							
								David Nalley 
							
						 
					 
					
						
						
						
						
							
						
						
							81c376dd5b 
							
						 
					 
					
						
						
							
							updating copyright licenses, including build-usage.xml  
						
						
						
						
					 
					
						2011-08-31 16:22:51 -04:00 
						 
				 
			
				
					
						
							
							
								David Nalley 
							
						 
					 
					
						
						
						
						
							
						
						
							ee81905814 
							
						 
					 
					
						
						
							
							merging usage  
						
						
						
						
					 
					
						2011-08-31 13:36:41 -04:00