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'
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>
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
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
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.