git.samba.org
/
samba.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
b3d098c
116f19b
)
Merge remote branch 'martins/master'
author
Ronnie Sahlberg
<ronniesahlberg@gmail.com>
Wed, 18 Apr 2012 03:48:43 +0000
(13:48 +1000)
committer
Ronnie Sahlberg
<ronniesahlberg@gmail.com>
Wed, 18 Apr 2012 03:48:43 +0000
(13:48 +1000)
(This used to be ctdb commit
abe7ebe6c531f912efe4ebc1daade4d2af67574c
)
1
2
ctdb/tests/scripts/ctdb_test_functions.bash
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
ctdb/tests/scripts/ctdb_test_functions.bash
Simple merge
git.samba.org / samba.git / commitdiff