diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-05-23 15:24:40 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-05-23 15:24:40 +0200 |
| commit | 7fb26774021986a08d03db968a7826ee64ea7410 (patch) | |
| tree | 272d8e4f7671b48c95c817724b41d9c27de1e282 /source4/scripting/python/samba/tests/provision.py | |
| parent | fd01b27edd5a83306f4ce567e31d43641dd003b8 (diff) | |
| parent | 1186579f94d81bc633b8f20e8ad8673313c8c39b (diff) | |
| download | samba-7fb26774021986a08d03db968a7826ee64ea7410.tar.gz samba-7fb26774021986a08d03db968a7826ee64ea7410.tar.xz samba-7fb26774021986a08d03db968a7826ee64ea7410.zip | |
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into registry
(This used to be commit e8d96b61db1cddc2d8dca45e6e9b53d5c31ee5d4)
Diffstat (limited to 'source4/scripting/python/samba/tests/provision.py')
| -rw-r--r-- | source4/scripting/python/samba/tests/provision.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source4/scripting/python/samba/tests/provision.py b/source4/scripting/python/samba/tests/provision.py index b9e0e16d3ca..76c10145f0a 100644 --- a/source4/scripting/python/samba/tests/provision.py +++ b/source4/scripting/python/samba/tests/provision.py @@ -21,7 +21,7 @@ import os from samba.provision import setup_secretsdb, secretsdb_become_dc, findnss import samba.tests from ldb import Dn -import param +from samba import param import unittest lp = samba.tests.cmdline_loadparm |