cloudstack/server
Rohit Yadav 37058a8e56 CLOUDSTACK-7903: Fix build regression from previous fix
The previous fix tried to access StatsCollector from UsageManagerImpl
which is not possible due to dependency cycle.

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit 1e0880cbab)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
2014-12-01 17:00:51 +05:30
..
conf Summary: Updated sudoers approved commands for cloud user 2013-10-23 13:42:16 -07:00
resources CLOUDSTACK-7144: No GSLB provider is available during assigning load 2014-11-25 19:50:37 +05:30
scripts License header updates for the server folder. 2012-08-03 09:41:27 -04:00
src CLOUDSTACK-7903: Fix build regression from previous fix 2014-12-01 17:00:51 +05:30
test CLOUDSTACK-7144: No GSLB provider is available during assigning load 2014-11-25 19:50:37 +05:30
pom.xml Revert "Revert "Bump release version to 4.3.2-SNAPSHOT and add empty db upgrade path"" 2014-11-21 18:04:33 +05:30