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)
(This used to be ctdb commit 17ff3f240b0d72c72ed28d70fb9aeb3b20c80670)

1  2 
ctdb/server/ctdb_recoverd.c
ctdb/server/ctdb_takeover.c

Simple merge
Simple merge