Merge branch 'master' of 10.1.1.27:/shared/ctdb/ctdb-master
authorRonnie Sahlberg <ronniesahlberg@gmail.com>
Fri, 28 Oct 2011 01:56:24 +0000 (12:56 +1100)
committerRonnie Sahlberg <ronniesahlberg@gmail.com>
Fri, 28 Oct 2011 01:56:24 +0000 (12:56 +1100)
commit86a14825145da86f6c47e2a8fa0197fae4cc9f9e
tree38dd9b762d2e7e6e94ab89838b9065b6937cb5f4
parente7cdc3cd4ccce97ad956b0c341eb01d38aa9db2b
parentbb3509b6d2ed7caee810d79fcc71db45a12d06e4
Merge branch 'master' of 10.1.1.27:/shared/ctdb/ctdb-master

(This used to be ctdb commit 0474a9244c6721f85955efcbdd630c0e5990e76c)