git.samba.org
/
tridge
/
ctdb.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
bf5402b
536229f
)
Merge commit 'origin/master'
author
Martin Schwenke
<martin@meltin.net>
Fri, 16 Oct 2009 05:36:48 +0000
(16:36 +1100)
committer
Martin Schwenke
<martin@meltin.net>
Fri, 16 Oct 2009 05:36:48 +0000
(16:36 +1100)
1
2
config/ctdb.init
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
config/ctdb.init
Simple merge