From 025ff72410385941c5da40ad42247f672af50bbe Mon Sep 17 00:00:00 2001
From: wrodrigues <wrodrigues@schubergphilis.com>
Date: Tue, 9 Sep 2014 22:52:05 +0200
Subject: [PATCH] fixing checkstyle in the virtual network manager. problem
 appeared after a rebase. probably due to my saving action in the eclipse
 workspace

Conflicts:
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
---
 .../network/router/VirtualNetworkApplianceManagerImpl.java      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
index d24ab43b83a..bbd316669af 100644
--- a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
+++ b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
@@ -2597,4 +2597,4 @@ Configurable, StateListener<State, VirtualMachine.Event, VirtualMachine> {
     public boolean completeAggregatedExecution(final Network network, final List<DomainRouterVO> routers) throws AgentUnavailableException {
         return aggregationExecution(Action.Finish, network, routers);
     }
-}
\ No newline at end of file
+}