cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject [41/50] [abbrv] git commit: updated refs/heads/master to 771d052
Date Tue, 14 Oct 2014 18:15:59 GMT
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/025ff724
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/025ff724
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/025ff724

Branch: refs/heads/master
Commit: 025ff72410385941c5da40ad42247f672af50bbe
Parents: 9f801d1
Author: wrodrigues <wrodrigues@schubergphilis.com>
Authored: Tue Sep 9 22:52:05 2014 +0200
Committer: wilderrodrigues <wrodrigues@schubergphilis.com>
Committed: Tue Oct 14 15:08:12 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/025ff724/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 d24ab43..bbd3166 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
+}


Mime
View raw message