git.samba.org / tridge / ctdb.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1717836 e382540)
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)
Merge commit 'metze/master-tdb-check'

Conflicts:

server/ctdb_vacuum.c


Trivial merge
CTDB repository