git.samba.org / samba.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b0fdfd8 66f92be)
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)
(This used to be ctdb commit 7bebfc7bad8f36e54003b8e25372fdaf54836e21)

1  2 
ctdb/include/ctdb_private.h patch | diff1 | diff2 | blob | history

diff --cc ctdb/include/ctdb_private.h
Simple merge
Samba Shared Repository