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)
commit7bebfc7bad8f36e54003b8e25372fdaf54836e21
treeb40e2ae0c0ed9485402de6dd602dab17305b6ea1
parenta3e8784bb107f7acd2a95913c1e6def52ce96105
parent2165a6f5117a71f9f97f46be9708fa34c037e17c
Merge remote branch 'ddiss/master_pmda_and_client_timeouts'
include/ctdb_private.h