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'
Move /xapi/* -> /xenops/* in XenStore

It's really xenops that's using these paths so it makes sense that these paths
be under that name.

Signed-off-by: Si Beaumont <simon.beaumont@citrix.com>
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'
Fix a typo in a comment.
Signed-off-by: Thomas Sanders <thomas.sanders@citrix.com>
New manpages 10/07/2013
CA-112882: Allow pool-join without v6d licensing daemon.

When xapi starts, if it cannot contact the licensing daemon it now
falls back to an edition-string of "free/libre" rather than "free".

A host is now allowed to join a pool if the edition-strings of all
hosts in the pool match the edition-string of the host that wants to
join.  Only if there is some mismatch do we consult v6d to work out
which different edition-strings are compatible.

Thus a pool of hosts with no licensing daemons can now be created.

This change also introduces a new error type for license-edition
mismatch between host and pool.

Signed-off-by: Thomas Sanders <thomas.sanders@citrix.com>
CP-6172: Add VBD.other_config:backend-kind

Note: this change is co-dependent on a change in xenopsd.

Blktap3 and kernel blkback need to co-exist and, since kernel blkback watches
keys in the /local/domain/0/vbd/ tree, the paths for blktap3 need to be moved.

A new key has been added to the other_config field of the VBD record which is
passed through to xenopsd to determine where to place the VBD's XenStore
entries.

Signed-off-by: Si Beaumont <simon.beaumont@citrix.com>
Merge pull request #1510 from thomassa/xcp-pool

CA-112882: Allow pool-join without v6d licensing daemon.
Merge pull request #1511 from Xenapi-Admin-Project/master

New manpages 10/07/2013
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>