Merge commit 'ronnie/master'
authorAndrew Tridgell <tridge@samba.org>
Thu, 16 Oct 2008 01:58:25 +0000 (12:58 +1100)
committerAndrew Tridgell <tridge@samba.org>
Thu, 16 Oct 2008 01:58:25 +0000 (12:58 +1100)
commit371e6aa15511cbc836e2b0c3aff0452b316abffc
tree63ec8fea33a741aeeae913f8f892f4fe5f35a2f5
parentc5edaf7a6ec3afd9ce578521553434ccc1a41241
parentf9beb55bf50faeda9a7fc04c43769c109e461986
Merge commit 'ronnie/master'

(This used to be ctdb commit 5403ed6dcfdfc101b05b43f83002e720d81b4e38)
ctdb/tools/ctdb_diagnostics