Damodar 8ec6d0471c CLOUDSTACK-7648: There are new VM State Machine changes introduced which were missed to capture the usage events ...

(cherry picked from commit 50185b7c3a1fd26e9a8635c28cee70fda32d3fc5)
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/core

Spring Modularization

2013-10-02 15:41:04 -07: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

pom.xml

Update master to 4.5.0-SNAPSHOT

2014-03-14 14:55:26 +01:00