xen-org/xen-api — pull request #981 by jeromemaloberti (2013-01-24 15:32:17+00:00)
Title: CA-94829: Set the TCP timeout properties on the migration fd

TAMPA-LCM: HFX 671

Signed-off-by: Jon Ludlam

Conflicts:
ocaml/xenguest/xenguest_main.ml

Signed-off-by: Jerome Maloberti