git.samba.org / amitay / samba.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: db79d62 348cad7)
Merge commit 'origin/master' into martins
authorMartin Schwenke <martin@meltin.net>
Fri, 12 Sep 2008 00:34:03 +0000 (10:34 +1000)
committerMartin Schwenke <martin@meltin.net>
Fri, 12 Sep 2008 00:34:03 +0000 (10:34 +1000)
(This used to be ctdb commit 79ad588d61a56a062c043eae6aba3370ec10ac61)

1  2 
ctdb/tools/onnode patch | diff1 | diff2 | blob | history

diff --cc ctdb/tools/onnode
Simple merge
Amitay's Samba development tree