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
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/9379d1a1
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/9379d1a1
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/9379d1a1
Branch: refs/heads/vpc-refactor
Commit: 9379d1a104ca581b03cd4fd1ded590da67205555
Parents: b948576
Author: wrodrigues <[email protected]>
Authored: Tue Sep 9 22:52:05 2014 +0200
Committer: Wilder Rodrigues <[email protected]>
Committed: Fri Oct 3 06:21:29 2014 +0200
----------------------------------------------------------------------
.../cloud/network/router/VirtualNetworkApplianceManagerImpl.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9379d1a1/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
----------------------------------------------------------------------
diff --git
a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
index 8d9ac7a..75cbfeb 100644
---
a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
+++
b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
@@ -2594,4 +2594,4 @@ public class VirtualNetworkApplianceManagerImpl extends
ManagerBase implements V
public boolean completeAggregatedExecution(final Network network, final
List<DomainRouterVO> routers) throws AgentUnavailableException {
return aggregationExecution(Action.Finish, network, routers);
}
-}
\ No newline at end of file
+}
