git.samba.org
/
jra
/
samba
/
.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
4fc27c9
2c9ee20
)
Merge with metze's change for oplocks to be on by default
author
Andrew Bartlett
<abartlet@samba.org>
Thu, 27 Mar 2008 09:38:36 +0000
(20:38 +1100)
committer
Andrew Bartlett
<abartlet@samba.org>
Thu, 27 Mar 2008 09:38:36 +0000
(20:38 +1100)
Andrew Bartlett
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local
Conflicts:
source/ntvfs/common/opendb_tdb.c
(This used to be commit
7c7a1a2b1f69cb4623c8832b732e8a1343ebd109
)
Trivial merge
git.samba.org / jra / samba / .git / commitdiff