Merge branch 'master' of 10.1.1.27:/shared/ctdb/ctdb-master
authorRonnie Sahlberg <ronniesahlberg@gmail.com>
Mon, 20 Feb 2012 10:30:13 +0000 (21:30 +1100)
committerRonnie Sahlberg <ronniesahlberg@gmail.com>
Mon, 20 Feb 2012 10:30:13 +0000 (21:30 +1100)
commitbaa3d7ea39c9b8225fd041e30745db1e1e683534
treec6768624dcd4938f48b6073a8251b1633b4e2d9e
parent40906c0e7b702c037a3ea3f41d0b114476a302a9
parent9323afa3867125268fe2accadf29f3277e908377
Merge branch 'master' of 10.1.1.27:/shared/ctdb/ctdb-master

(This used to be ctdb commit 0fd3bf919b1b8e5aaa98444c306c6770a6a3209f)