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)
commit17ff3f240b0d72c72ed28d70fb9aeb3b20c80670
treed92a47186228286e2394cf8ac1c15dbd68131641
parentfdd5b9ac0a79f6bc7c8a05da2e2f11e002392bcd
parent483459c79884891b3639a8bb865d5e8318cde98c
Merge remote branch 'amitay/tevent-sync'
server/ctdb_recoverd.c
server/ctdb_takeover.c