cloudstack/plugins/network-elements/netscaler/src/com/cloud
Sujaya Maiyya 5b549fd869 fixed CLOUDSTACK-6261: remove the forceful timeout setting when login to NetScaler.
(cherry picked from commit e07d0ddabf)
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 5563a7314e)

Conflicts:
	plugins/network-elements/netscaler/src/com/cloud/network/resource/NetscalerResource.java
2014-11-21 14:40:04 +01:00
..
api Merge branch 'master' into rbac. 2014-03-06 14:02:20 -08:00
network fixed CLOUDSTACK-6261: remove the forceful timeout setting when login to NetScaler. 2014-11-21 14:40:04 +01:00