fix conflict in merge from metze
authorRonnie Sahlberg <ronniesahlberg@gmail.com>
Wed, 16 Dec 2009 07:34:40 +0000 (18:34 +1100)
committerRonnie Sahlberg <ronniesahlberg@gmail.com>
Wed, 16 Dec 2009 07:34:40 +0000 (18:34 +1100)
commit95eaa9f2363f113460ca40dacc8bab77c094c237
tree977de56d13bde8038ad2f930260751f999b57546
parentdb99f988e23068d37d63056677ca28c441cd6368
parent4626665b7e9ec21a6723801dfd67c940cac5a951
fix conflict in merge from metze

Merge commit 'metze/master-tdb-check'

Conflicts:

server/ctdb_vacuum.c

(This used to be ctdb commit 82421f20dcad4b0e25f109583879a26c0ee9c465)