git.samba.org / metze / ctdb / wip.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e553da6 3727165)
Merge commit 'rusty/libctdb2'
authorRonnie Sahlberg <ronniesahlberg@gmail.com>
Tue, 25 May 2010 02:48:49 +0000 (12:48 +1000)
committerRonnie Sahlberg <ronniesahlberg@gmail.com>
Tue, 25 May 2010 02:48:49 +0000 (12:48 +1000)
1  2 
packaging/RPM/ctdb.spec.in patch | diff1 | diff2 | blob | history
tests/src/ctdb_bench.c patch | diff1 | diff2 | blob | history
tools/ctdb.c patch | diff1 | diff2 | blob | history

diff --cc packaging/RPM/ctdb.spec.in
Simple merge
diff --cc tests/src/ctdb_bench.c
Simple merge
diff --cc tools/ctdb.c
Simple merge
Work in progress branches