| commit | 7c7a1a2b1f69cb4623c8832b732e8a1343ebd109 | |
| author | Andrew Bartlett <abartlet@samba.org> | |
| Thu, 27 Mar 2008 09:38:36 +0000 (27 20:38 +1100) | ||
| committer | Andrew Bartlett <abartlet@samba.org> | |
| Thu, 27 Mar 2008 09:38:36 +0000 (27 20:38 +1100) | ||
| tree | b916fd06a5dbd7904893d9b980495167c622971d | treesnapshot (tar.gz zip) |
| parent | f2c65f9907760b8852b70c53637388f08751ba88 | commitdiff |
| parent | 9342c4f5ff2be16c9771fd07fbec87076af2e681 | commitdiff |
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
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