Merge branch 'master' of ssh://git.samba.org/data/git/ctdb
authorRonnie Sahlberg <ronniesahlberg@gmail.com>
Tue, 3 Jan 2012 01:40:15 +0000 (12:40 +1100)
committerRonnie Sahlberg <ronniesahlberg@gmail.com>
Tue, 3 Jan 2012 01:40:15 +0000 (12:40 +1100)
(This used to be ctdb commit 15d8ae8b0f80f95d7839528b8ac60aa0e2485c77)

1  2 
ctdb/tools/ctdb.c
ctdb/tools/ctdb_vacuum.c

Simple merge
Simple merge