git.samba.org / ctdb.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ea9e393 c5a0aef)
Merge commit 'obnox/ctdb-wip-trans3' into trans3
authorRonnie Sahlberg <ronniesahlberg@gmail.com>
Tue, 15 Dec 2009 03:25:55 +0000 (14:25 +1100)
committerRonnie Sahlberg <ronniesahlberg@gmail.com>
Tue, 15 Dec 2009 03:25:55 +0000 (14:25 +1100)
1  2 
include/ctdb_private.h patch | diff1 | diff2 | blob | history
server/ctdb_tunables.c patch | diff1 | diff2 | blob | history

diff --cc include/ctdb_private.h
Simple merge
diff --cc server/ctdb_tunables.c
Simple merge
CTDB repository