git.samba.org
/
metze
/
ctdb
/
wip.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
ee7caae
b67946a
)
Merge commit 'origin/master' into ronnie_merge
author
Martin Schwenke
<martin@meltin.net>
Wed, 8 Jul 2009 04:21:05 +0000
(14:21 +1000)
committer
Martin Schwenke
<martin@meltin.net>
Wed, 8 Jul 2009 04:21:05 +0000
(14:21 +1000)
Conflicts:
config/ctdb.init
Signed-off-by: Martin Schwenke <martin@meltin.net>
Trivial merge
git.samba.org / metze / ctdb / wip.git / commitdiff