You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by mc...@apache.org on 2013/07/26 03:04:35 UTC
[3/3] git commit: updated refs/heads/master to db93ebf
Fix build break due to commit 2e0847bfe01e74f5c80e028b66aee74d7a07493f.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/db93ebf1
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/db93ebf1
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/db93ebf1
Branch: refs/heads/master
Commit: db93ebf169bf6a050eafec8c7a3bfaff054ddf4a
Parents: 45d38c4
Author: Min Chen <mi...@citrix.com>
Authored: Thu Jul 25 18:04:12 2013 -0700
Committer: Min Chen <mi...@citrix.com>
Committed: Thu Jul 25 18:04:12 2013 -0700
----------------------------------------------------------------------
server/src/com/cloud/network/guru/ControlNetworkGuru.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/db93ebf1/server/src/com/cloud/network/guru/ControlNetworkGuru.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/guru/ControlNetworkGuru.java b/server/src/com/cloud/network/guru/ControlNetworkGuru.java
index 4c5d247..40aa468 100755
--- a/server/src/com/cloud/network/guru/ControlNetworkGuru.java
+++ b/server/src/com/cloud/network/guru/ControlNetworkGuru.java
@@ -5,7 +5,7 @@
// to you under the Apache License, Version 2.0 (the
// "License"); you may not use this file except in compliance
// with the License. You may obtain a copy of the License at
-//
+//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing,
@@ -194,7 +194,7 @@ public class ControlNetworkGuru extends PodBasedNetworkGuru implements NetworkGu
return true;
}
- protected boolean isRouterVm(VirtualMachineProfile<? extends VirtualMachine> vm) {
+ protected boolean isRouterVm(VirtualMachineProfile vm) {
return vm.getType() == VirtualMachine.Type.DomainRouter || vm.getType() == VirtualMachine.Type.InternalLoadBalancerVm;
}