git.samba.org / amitay / samba.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e7cdc3c bb3509b)
Merge branch 'master' of 10.1.1.27:/shared/ctdb/ctdb-master
authorRonnie Sahlberg <ronniesahlberg@gmail.com>
Fri, 28 Oct 2011 01:56:24 +0000 (12:56 +1100)
committerRonnie Sahlberg <ronniesahlberg@gmail.com>
Fri, 28 Oct 2011 01:56:24 +0000 (12:56 +1100)
(This used to be ctdb commit 0474a9244c6721f85955efcbdd630c0e5990e76c)


Trivial merge
Amitay's Samba development tree