Merge commit 'martins/status-test-2'
authorRonnie Sahlberg <ronniesahlberg@gmail.com>
Mon, 30 Nov 2009 23:53:18 +0000 (10:53 +1100)
committerRonnie Sahlberg <ronniesahlberg@gmail.com>
Mon, 30 Nov 2009 23:53:18 +0000 (10:53 +1100)
commite9b3477a5b9a2eff18f727e7d59338bfb5214793
tree429eaccfe75cc645d686a8c12344220679a89232
parent12b187f971d857353403393a9850503e0e558672
parenta1f37fdc5217e57d2d643d77a811afca747685e0
Merge commit 'martins/status-test-2'

Conflicts:

server/eventscript.c
include/ctdb_private.h
server/ctdb_control.c
server/ctdb_takeover.c
server/eventscript.c