git.samba.org / ira / wip.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 4fc27c9 2c9ee20)
Merge with metze's change for oplocks to be on by default
authorAndrew Bartlett <abartlet@samba.org>
Thu, 27 Mar 2008 09:38:36 +0000 (20:38 +1100)
committerAndrew Bartlett <abartlet@samba.org>
Thu, 27 Mar 2008 09:38:36 +0000 (20:38 +1100)
commitc24b8cbe5351d2b192480ff8cbd02b3f048b8e8a
treeddd0b5764d2dba4e6a6ccedd3101a5486dbf01c1tree
parent4fc27c9969960dfef73ad80438d274e0f45e119ecommit | diff
parent2c9ee20f15ef0f55bf4e2516ba498cc6d9403b71commit | diff
Merge ... metze's change for oplocks to be on by default

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)
Unnamed repository; edit this file 'description' to name the repository.