CA-106403: A timed out connection on writedb must be closed too.

Signed-off-by: Jerome Maloberti <jerome.maloberti@citrix.com>
CA-106403: The DB should be locked before being flushed on redo_log.

Signed-off-by: Jerome Maloberti <jerome.maloberti@citrix.com>
CA-106403: Fix pool-sync-database in case of failure with redo_logs.

Signed-off-by: Jerome Maloberti <jerome.maloberti@citrix.com>
CA-111029: Switch to the C xenguest.
Merge commit '69cb32b81cbe94ab22cf917dab489f832e469f10'
CP-6271: Set default mode for XSM checks to use UUIDs

After this change the code at xapi_vm_migrate.ml:362 will
check if the VDI exists (by UUID) in the destination SR.
If it does, a mirror will not be performed as the VDI already exists.

The original behaviour can be used by setting the value to false in xapi.conf

Signed-off-by: Bob Ball <bob.ball@citrix.com>
Merge commit '1278c5c9f38f80fc3f8af1633c7df526eb28b873'
CA-114333: Allow Linux HVM guests to use >4 devices.

Windows PV drivers don't check the guest device name, but the Linux kernel does
With devices > 4, Linux expects them to be in xvdN format, so this patch ensures
that all devices are treated as Linux devices

Signed-off-by: Bob Ball <bob.ball@citrix.com>

Conflicts:

	ocaml/xenops/device_number.ml
Merge commit '9c97c20ff839de6e704994ba4ac695b1f1936ed9'
CA-116369: Fix compatibility problem with Python 2.6

In Python 2.6 socket.error class inherit from IOError. For this reason
checking for socket.error exception after IOError cause the catch path to
never get taken. Fix this problem checking for socket.error before IOError.

Signed-off-by: Frediano Ziglio <frediano.ziglio@citrix.com>
Initial commit of .merlin file

Signed-off-by: Mike McClurg <mike.mcclurg@citrix.com>
Merge pull request #1523 from mcclurmc/merlin

Initial commit of .merlin file
CA-99828 Add a new bond option: lacp-fallback-ab

lacp-fallback-ab allows lacp bond to fallback to active-backup
when there is no lacp partner.

Signed-off-by: Ravi Kondamuru <Ravi.Kondamuru@citrix.com>
Merge pull request #1522 from mcclurmc/ca116369-perfmon

CA-116369: Fix compatibility problem with Python 2.6
Merge git://hg/carbon/trunk/xen-api
Merge pull request #1355 from jeromemaloberti/CA-106403

CA-106403: A timed out connection on writedb must be closed too.
Update datamodel.ml

Clarifying the event class documentation. from is better than next and correcting the return from "from" to include the token which was absent.
CA-118027: Don't send RPC calls that are too large

The request size limit is known by xapi and so slaves shouldn't try and send
requests that it knows will be rejected.

Signed-off-by: Si Beaumont <simon.beaumont@citrix.com>

Conflicts:
	ocaml/database/master_connection.ml

Resolved-by: Si Beaumont <simon.beaumont@citrix.com>
Merge pull request #1529 from rhb21/patch-1

Update datamodel.ml
Merge pull request #1525 from ravikondamuru/CA-99828

CA-99828 Add a new bond option: lacp-fallback-ab