git.samba.org / vlendec / samba-autobuild / .git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8017393 ef20fea)
Merge remote branch 'martins/ctdb_control_oom'
authorRonnie Sahlberg <ronniesahlberg@gmail.com>
Fri, 18 Nov 2011 03:45:56 +0000 (14:45 +1100)
committerRonnie Sahlberg <ronniesahlberg@gmail.com>
Fri, 18 Nov 2011 03:45:56 +0000 (14:45 +1100)
(This used to be ctdb commit 6a57c64c58c77fd9dc7c7a1583d402c3ce0313b1)


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.