summaryrefslogtreecommitdiffstats
path: root/func/minion/modules/func_module.py
diff options
context:
space:
mode:
authorKrzysztof A. Adamski <krzysztofa@gmail.com>2008-07-24 23:34:34 +0200
committerKrzysztof A. Adamski <krzysztofa@gmail.com>2008-07-24 23:34:34 +0200
commitcf98349b19f8a44ca67d213ca79b7fc0abe519c9 (patch)
treec8014f93093d0f9d97e97f4329fc4af3a7c8bbf1 /func/minion/modules/func_module.py
parent81afe49756aca1d1ab80180fe4eabe019f5c3f4e (diff)
parent540a752d3b0ffbf91e27293474e15ce69566e43f (diff)
downloadfunc-cf98349b19f8a44ca67d213ca79b7fc0abe519c9.tar.gz
func-cf98349b19f8a44ca67d213ca79b7fc0abe519c9.tar.xz
func-cf98349b19f8a44ca67d213ca79b7fc0abe519c9.zip
Merge kadamski@git.fedorahosted.org:/git/func
Diffstat (limited to 'func/minion/modules/func_module.py')
-rw-r--r--func/minion/modules/func_module.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/func/minion/modules/func_module.py b/func/minion/modules/func_module.py
index d75cb33..56f21f9 100644
--- a/func/minion/modules/func_module.py
+++ b/func/minion/modules/func_module.py
@@ -13,7 +13,7 @@
import inspect
from func import logger
-from func.config import read_config, BaseConfig
+from certmaster.config import read_config, BaseConfig
from func.commonconfig import FuncdConfig
from func.minion.func_arg import * #the arg getter stuff