xapi-project/xen-api-libs — pull request #164 by Zhengchai (2014-07-30 05:01:25+00:00)
Title: HFX-1149: Pick SCTX-1766: Configurable timeout for stunnel from creedence (7541b5a) to clearwater-sp1-lcm

Imported from xen-api-libs-transitional.git
9e46fa5d7ae9c4d3f10e58fce968bcee91e5bbbc

Signed-off-by: Akshay
Imported-by: John Else

Resolve Merge Conflicts for clearwater-sp1-lcm
stunnel/stunnel.ml

Signed-off-by: Zheng Chai