Merge remote branch 'amitay/tevent-sync'

author Ronnie Sahlberg <ronniesahlberg@gmail.com>

Wed, 25 Apr 2012 22:09:23 +0000 (08:09 +1000)

committer Ronnie Sahlberg <ronniesahlberg@gmail.com>

Wed, 25 Apr 2012 22:09:23 +0000 (08:09 +1000)
author Ronnie Sahlberg <ronniesahlberg@gmail.com>
Wed, 25 Apr 2012 22:09:23 +0000 (08:09 +1000)
committer Ronnie Sahlberg <ronniesahlberg@gmail.com>
Wed, 25 Apr 2012 22:09:23 +0000 (08:09 +1000)
diff --cc server/ctdb_recoverd.c
Simple merge
diff --cc server/ctdb_takeover.c
Simple merge
author	Ronnie Sahlberg <ronniesahlberg@gmail.com>
	Wed, 25 Apr 2012 22:09:23 +0000 (08:09 +1000)
committer	Ronnie Sahlberg <ronniesahlberg@gmail.com>
	Wed, 25 Apr 2012 22:09:23 +0000 (08:09 +1000)
		1	2
server/ctdb_recoverd.c	patch \|	diff1 \|	diff2 \|	blob \| history
server/ctdb_takeover.c	patch \|	diff1 \|	diff2 \|	blob \| history