git.samba.org / metze / samba / wip.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f7b2adf 88c7498)
Merge remote branch 'martins/master'
authorRonnie Sahlberg <ronniesahlberg@gmail.com>
Thu, 15 Mar 2012 05:09:41 +0000 (16:09 +1100)
committerRonnie Sahlberg <ronniesahlberg@gmail.com>
Thu, 15 Mar 2012 05:09:41 +0000 (16:09 +1100)
(This used to be ctdb commit af72f8bc05f78983f9624d81788f9d89af474b11)

1  2 
ctdb/tools/ctdb.c patch | diff1 | diff2 | blob | history

diff --cc ctdb/tools/ctdb.c
Simple merge
Work in progress branches