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
..
resources/META-INF/cloudstack	Removed "host" config parameter definition from ClusterManager interface as it got moved to cloud-api package	2014-01-21 17:19:52 -08: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	Merge branch 'master' into marvin	2014-04-08 17:53:37 +05:30
pom.xml	api: fix refactored ApiServerService interface to api	2014-08-28 19:45:22 +02:00