cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject git commit: updated refs/heads/4.4 to 5b549fd
Date Fri, 21 Nov 2014 13:40:41 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/4.4 25876c6be -> 5b549fd86


fixed CLOUDSTACK-6261: remove the forceful timeout setting when login to NetScaler.

(cherry picked from commit e07d0ddabfedad137856c3c9ae7de3a96fe25feb)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	plugins/network-elements/netscaler/src/com/cloud/network/resource/NetscalerResource.java

(cherry picked from commit 5563a7314e4ec1d4dcc5674dfa831fd0328c06a9)

Conflicts:
	plugins/network-elements/netscaler/src/com/cloud/network/resource/NetscalerResource.java


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

Branch: refs/heads/4.4
Commit: 5b549fd8694d46fd16dbd6c7c237f713eda18421
Parents: 25876c6
Author: Sujaya Maiyya <sujaya.maiyya@citrix.com>
Authored: Tue Jul 8 14:42:39 2014 +0530
Committer: Daan Hoogland <daan@onecht.net>
Committed: Fri Nov 21 14:40:04 2014 +0100

----------------------------------------------------------------------
 .../src/com/cloud/network/resource/NetscalerResource.java         | 3 ---
 1 file changed, 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5b549fd8/plugins/network-elements/netscaler/src/com/cloud/network/resource/NetscalerResource.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/netscaler/src/com/cloud/network/resource/NetscalerResource.java
b/plugins/network-elements/netscaler/src/com/cloud/network/resource/NetscalerResource.java
index c4250b6..4740a80 100644
--- a/plugins/network-elements/netscaler/src/com/cloud/network/resource/NetscalerResource.java
+++ b/plugins/network-elements/netscaler/src/com/cloud/network/resource/NetscalerResource.java
@@ -171,7 +171,6 @@ public class NetscalerResource implements ServerResource {
     // interface to interact with service VM of the SDX appliance
     com.citrix.sdx.nitro.service.nitro_service _netscalerSdxService;
 
-    Long _timeout = new Long(100000);
     base_response apiCallResult;
 
     public NetscalerResource() {
@@ -294,7 +293,6 @@ public class NetscalerResource implements ServerResource {
             if (!_isSdx) {
                 _netscalerService = new nitro_service(_ip, "https");
                 _netscalerService.set_credential(_username, _password);
-                _netscalerService.set_timeout(_timeout);
                 _netscalerService.set_certvalidation(false);
                 _netscalerService.set_hostnameverification(false);
                 apiCallResult = _netscalerService.login();
@@ -980,7 +978,6 @@ public class NetscalerResource implements ServerResource {
                 try {
                     nitro_service _netscalerService = new nitro_service(cmd.getLoadBalancerIP(),
"https");
                     _netscalerService.set_credential(username, password);
-                    _netscalerService.set_timeout(_timeout);
                     apiCallResult = _netscalerService.login();
                     if (apiCallResult.errorcode == 0) {
                         nsServiceUp = true;


Mime
View raw message