cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From raj...@apache.org
Subject [2/3] git commit: updated refs/heads/master to 99bb500
Date Tue, 25 Oct 2016 10:34:15 GMT
Use timeout when applying config to virtual router


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/5d4b5fd6
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/5d4b5fd6
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/5d4b5fd6

Branch: refs/heads/master
Commit: 5d4b5fd642d250f45ec62ea7f28577d885e3665a
Parents: 5251eed
Author: Aaron Brady <aaron@iweb.co.uk>
Authored: Wed Mar 23 12:15:24 2016 +0000
Committer: Aaron Brady <aaron@insom.me.uk>
Committed: Sat Mar 26 00:39:04 2016 +0000

----------------------------------------------------------------------
 .../agent/resource/virtualnetwork/VirtualRoutingResource.java      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5d4b5fd6/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java
b/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java
index f3edc69..f271e72 100644
--- a/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java
+++ b/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java
@@ -379,7 +379,7 @@ public class VirtualRoutingResource {
                     timeout = 120;
                 }
 
-                ExecutionResult result = applyConfigToVR(cmd.getRouterAccessIp(), fileConfigItem);
+                ExecutionResult result = applyConfigToVR(cmd.getRouterAccessIp(), fileConfigItem,
timeout);
                 if (!result.isSuccess()) {
                     return new Answer(cmd, false, result.getDetails());
                 }


Mime
View raw message