fix a conflict in the merge from rusty
authorRonnie Sahlberg <ronniesahlberg@gmail.com>
Wed, 16 Dec 2009 21:18:04 +0000 (08:18 +1100)
committerRonnie Sahlberg <ronniesahlberg@gmail.com>
Wed, 16 Dec 2009 21:18:04 +0000 (08:18 +1100)
commitb4365045797f520a7914afdb69ebd1a8dacfa0d9
treed244011b8c3aafbaff2fcfd777e3a8c71d1a4d8e
parent82421f20dcad4b0e25f109583879a26c0ee9c465
parent82f778e85440bc713d3f87c08ddc955d3cfce926
fix a conflict in the merge from rusty

Merge commit 'rusty/ctdb-no-setsched'

Conflicts:

server/ctdb_vacuum.c
client/ctdb_client.c
config/ctdb.init
include/ctdb_private.h
server/ctdb_daemon.c
server/ctdb_ltdb_server.c
server/ctdb_recoverd.c
server/ctdb_vacuum.c
server/ctdbd.c