Merge remote branch 'ddiss/master_pmda_and_client_timeouts'
authorRonnie Sahlberg <ronniesahlberg@gmail.com>
Thu, 8 Sep 2011 01:22:53 +0000 (11:22 +1000)
committerRonnie Sahlberg <ronniesahlberg@gmail.com>
Thu, 8 Sep 2011 01:22:53 +0000 (11:22 +1000)
commit1c05db2c9c0173ab30958cd5afceb46efb4b11c4
tree6fb8d04fce7481494345b07d52a24f0d6dc7b289
parentb0fdfd8ec9a035c4c66e6a146b43f9a0a27da707
parent66f92be635f5d001fb82517175f44cc72fe7db61
Merge remote branch 'ddiss/master_pmda_and_client_timeouts'

(This used to be ctdb commit 7bebfc7bad8f36e54003b8e25372fdaf54836e21)
ctdb/include/ctdb_private.h