Merge branch 'master' of 10.1.1.27:/shared/ctdb/ctdb-master
authorRonnie Sahlberg <ronniesahlberg@gmail.com>
Fri, 28 Oct 2011 02:51:46 +0000 (13:51 +1100)
committerRonnie Sahlberg <ronniesahlberg@gmail.com>
Fri, 28 Oct 2011 02:51:46 +0000 (13:51 +1100)
commit25f1b4eb8628f27ef6eb15a0543cb9f6c2d23803
treec70379238b0089777251f45c5beeadaca318f847
parent86a14825145da86f6c47e2a8fa0197fae4cc9f9e
parent74579a31930f78719b2cc42650ec7efefceef2ef
Merge branch 'master' of 10.1.1.27:/shared/ctdb/ctdb-master

(This used to be ctdb commit 996aa01af9b402d2cd07c6942fdcc5ffc111ca85)