You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by fr...@apache.org on 2013/09/17 01:01:29 UTC
git commit: updated refs/heads/4.2-forward to 584bb9b
Updated Branches:
refs/heads/4.2-forward 5d1303329 -> 584bb9bc0
CLOUDSTACK-4689
UI:API: associate Profile to Blade may take longer in some cases, which will result in timeout
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/584bb9bc
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/584bb9bc
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/584bb9bc
Branch: refs/heads/4.2-forward
Commit: 584bb9bc0c5b93f0f36ab3c28f5b495624cbdd3c
Parents: 5d13033
Author: frank <fr...@citrix.com>
Authored: Mon Sep 16 16:11:03 2013 -0700
Committer: frank <fr...@citrix.com>
Committed: Mon Sep 16 16:11:03 2013 -0700
----------------------------------------------------------------------
.../hypervisors/ucs/src/com/cloud/ucs/manager/UcsManagerImpl.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/584bb9bc/plugins/hypervisors/ucs/src/com/cloud/ucs/manager/UcsManagerImpl.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/ucs/src/com/cloud/ucs/manager/UcsManagerImpl.java b/plugins/hypervisors/ucs/src/com/cloud/ucs/manager/UcsManagerImpl.java
index 05b1214..4000e98 100755
--- a/plugins/hypervisors/ucs/src/com/cloud/ucs/manager/UcsManagerImpl.java
+++ b/plugins/hypervisors/ucs/src/com/cloud/ucs/manager/UcsManagerImpl.java
@@ -375,7 +375,7 @@ public class UcsManagerImpl implements UcsManager {
UcsHttpClient client = new UcsHttpClient(mgrvo.getUrl());
String res = client.call(ucscmd);
int count = 0;
- int timeout = 600;
+ int timeout = 3600;
while (count < timeout) {
if (isBladeAssociated(mgrvo.getId(), bvo.getDn())) {
break;