Merge remote branch 'amitay/tevent-sync'
authorRonnie Sahlberg <ronniesahlberg@gmail.com>
Wed, 25 Apr 2012 22:09:23 +0000 (08:09 +1000)
committerRonnie Sahlberg <ronniesahlberg@gmail.com>
Wed, 25 Apr 2012 22:09:23 +0000 (08:09 +1000)
commitdb411aaada39593c80f92e46be31d3473bf4639f
treef68222404db2155cc6d8d3f861ac486cb8a509ae
parent58e10b280d4a94a812bad07bbca049cddb2c1174
parent195cf3c87e3c6c9f1784aa483110a64bc8760703
Merge remote branch 'amitay/tevent-sync'

(This used to be ctdb commit 17ff3f240b0d72c72ed28d70fb9aeb3b20c80670)
ctdb/server/ctdb_recoverd.c
ctdb/server/ctdb_takeover.c