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)
commite6480454990a2736928541b63db4ee8f8e07ef48
treec3cdef2c4621ac989120cef3e7775b036c148196
parentb417300668ead1fb4858db407c61cbab0ea69689
parentbf99bb65e0327d53ccc095153d695f20c34beabc
Merge branch 'master' of ssh://git.samba.org/data/git/ctdb

(This used to be ctdb commit 15d8ae8b0f80f95d7839528b8ac60aa0e2485c77)
ctdb/tools/ctdb.c
ctdb/tools/ctdb_vacuum.c