You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bh...@apache.org on 2015/03/17 11:26:47 UTC
[45/50] git commit: updated refs/heads/master to 3c429ee
Disable this for now - causes too much grief
Is also the root cause of the status UNKNOWN
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/c38f0b91
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/c38f0b91
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/c38f0b91
Branch: refs/heads/master
Commit: c38f0b91e333708d6416947832c3c016a23328ef
Parents: 585f5f7
Author: Ian Southam <is...@schubergphilis.com>
Authored: Thu Feb 26 17:09:13 2015 +0100
Committer: wilderrodrigues <wr...@schubergphilis.com>
Committed: Mon Mar 16 11:40:10 2015 +0100
----------------------------------------------------------------------
.../network/router/VirtualNetworkApplianceManagerImpl.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c38f0b91/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 383381e..905a041 100644
--- a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
+++ b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
@@ -1104,7 +1104,7 @@ Configurable, StateListener<State, VirtualMachine.Event, VirtualMachine> {
} else {
// Wilder Rodrigues (wrodrigues@schubergphilis.com
// Force a restart in order to fix the conflict
- recoverRedundantNetwork(masterRouter, r);
+ // recoverRedundantNetwork(masterRouter, r);
break;
}
} else if (r.getRedundantState() == RedundantState.BACKUP) {
@@ -1113,7 +1113,7 @@ Configurable, StateListener<State, VirtualMachine.Event, VirtualMachine> {
} else {
// Wilder Rodrigues (wrodrigues@schubergphilis.com
// Do we have 2 routers in Backup state? Perhaps a restart of 1 router is needed.
- recoverRedundantNetwork(backupRouter, r);
+ // recoverRedundantNetwork(backupRouter, r);
break;
}
}
@@ -2746,4 +2746,4 @@ Configurable, StateListener<State, VirtualMachine.Event, VirtualMachine> {
public boolean completeAggregatedExecution(final Network network, final List<DomainRouterVO> routers) throws AgentUnavailableException, ResourceUnavailableException {
return aggregationExecution(Action.Finish, network, routers);
}
-}
\ No newline at end of file
+}