Damodar 8ec6d0471c CLOUDSTACK-7648: There are new VM State Machine changes introduced which were missed to capture the usage events ... (cherry picked from commit 50185b7c3a) Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com> Conflicts: plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalManagerImpl.java server/src/com/cloud/capacity/CapacityManagerImpl.java server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java		2015-02-05 14:56:52 +05:30
..
conf	Summary: Updated sudoers approved commands for cloud user	2013-10-23 13:42:16 -07:00
resources	removed unused class	2014-09-09 18:31:13 -07:00
scripts	License header updates for the server folder.	2012-08-03 09:41:27 -04:00
src	CLOUDSTACK-7648: There are new VM State Machine changes introduced which were missed to capture the usage events	2015-02-05 14:56:52 +05:30
test	CLOUDSTACK-7771: Throw exception while restoring vm if the template is already deleted. Also fix the usage event being generated from the right template id and fix the log message which sometime showed incorrect template id.	2015-01-20 12:05:25 +05:30
pom.xml	server: fix server package after auth plugin refactor	2014-08-28 19:45:23 +02:00