Rohit Yadav 5241d0faf8 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 16:39:01 +05:30
..
cloudstack/utils	CLOUDSTACK-7903: Fix build regression from previous fix	2014-12-01 16:39:01 +05:30
commons/httpclient/contrib/ssl	cisco-vnmc: Don't create Protocol using deprecated SecureProtocolSocketFactory	2014-08-29 14:39:29 +02:00