Merge branch 'master' of 10.1.1.27:/shared/ctdb/ctdb-master
authorRonnie Sahlberg <ronniesahlberg@gmail.com>
Mon, 24 Oct 2011 02:30:28 +0000 (13:30 +1100)
committerRonnie Sahlberg <ronniesahlberg@gmail.com>
Mon, 24 Oct 2011 02:30:28 +0000 (13:30 +1100)
commit26aee76add311c43399b90c3d913226ea2feff3b
tree6684c9098845ce51ea49a690993d29289b8ea420
parent4dabd1fe05e78dcb36937cb49f2daa29ee452909
parentf7db49798c810f948b68e54cb070abf9d0518910
Merge branch 'master' of 10.1.1.27:/shared/ctdb/ctdb-master

(This used to be ctdb commit 0a2ea7e1a1e034a9a17debff763084a0936b0515)