diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2008-04-19 09:59:07 +0200 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2008-04-19 09:59:07 +0200 |
| commit | 61fba825940b03ac954208cc0ead4ed2c0af848a (patch) | |
| tree | a1bd49b2ec3ef31f39307439cdd1c4711644c44c /source4/torture/smb2/config.mk | |
| parent | 0321bc02598087685c6ea144e3920a64ab909b83 (diff) | |
| parent | f0eb488d221d2d12d750babac0252aac671d92f4 (diff) | |
| download | samba-61fba825940b03ac954208cc0ead4ed2c0af848a.tar.gz samba-61fba825940b03ac954208cc0ead4ed2c0af848a.tar.bz2 samba-61fba825940b03ac954208cc0ead4ed2c0af848a.zip | |
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet
(This used to be commit 13a0941d3432dc7dae552048265ad1e762b781d4)
Diffstat (limited to 'source4/torture/smb2/config.mk')
| -rw-r--r-- | source4/torture/smb2/config.mk | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source4/torture/smb2/config.mk b/source4/torture/smb2/config.mk index 12d5edbeb2..f3318bb736 100644 --- a/source4/torture/smb2/config.mk +++ b/source4/torture/smb2/config.mk @@ -21,5 +21,6 @@ TORTURE_SMB2_OBJ_FILES = $(addprefix torture/smb2/, \ lock.o \ notify.o \ smb2.o \ - persistent_handles.o) + persistent_handles.o \ + oplocks.o) |