Merge kadamski@git.fedorahosted.org:/git/func

8 files changed, 8 insertions, 8 deletions

diff --git a/func/logger.py b/func/logger.py
index e679f3d..cef4a4b 100755
--- a/func/logger.py
+++ b/func/logger.py
@@ -14,7 +14,7 @@
 
 
 import logging
-from func.config import read_config
+from certmaster.config import read_config
 from func.commonconfig import FuncdConfig
 
 
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
 
diff --git a/func/minion/server.py b/func/minion/server.py
index 36f3262..ede0640 100755
--- a/func/minion/server.py
+++ b/func/minion/server.py
@@ -23,7 +23,7 @@ from gettext import textdomain
 I18N_DOMAIN = "func"
 
 
-from func.config import read_config
+from certmaster.config import read_config
 from func.commonconfig import FuncdConfig
 from certmaster.commonconfig import CMConfig
 from func import logger
diff --git a/func/overlord/client.py b/func/overlord/client.py
index 0982e94..8165348 100755
--- a/func/overlord/client.py
+++ b/func/overlord/client.py
@@ -21,7 +21,7 @@ import func.yaml as yaml
 
 from certmaster.commonconfig import CMConfig
 from certmaster import utils
-from func.config import read_config, CONFIG_FILE
+from certmaster.config import read_config, CONFIG_FILE
 
 import sslclient
 
diff --git a/func/overlord/cmd_modules/call.py b/func/overlord/cmd_modules/call.py
index 6fdd32f..afad071 100644
--- a/func/overlord/cmd_modules/call.py
+++ b/func/overlord/cmd_modules/call.py
@@ -21,7 +21,7 @@ import sys
 
 from func.overlord import client
 from func.overlord import base_command
-from func.config import read_config, BaseConfig, ListOption
+from certmaster.config import read_config, BaseConfig, ListOption
 
 import func.jobthing as jobthing
 
diff --git a/func/overlord/cmd_modules/check.py b/func/overlord/cmd_modules/check.py
index 80913e4..58ecc6c 100644
--- a/func/overlord/cmd_modules/check.py
+++ b/func/overlord/cmd_modules/check.py
@@ -21,7 +21,7 @@ import urllib2
 from func.overlord import base_command
 from func import utils
 from func.minion import sub_process
-from func.config import read_config
+from certmaster.config import read_config
 from certmaster.commonconfig import MinionConfig
 
 
diff --git a/func/overlord/command.py b/func/overlord/command.py
index 6e8e137..c17f060 100644
--- a/func/overlord/command.py
+++ b/func/overlord/command.py
@@ -14,7 +14,7 @@ Command class.
 import optparse
 import sys
 
-from func.config import read_config, CONFIG_FILE
+from certmaster.config import read_config, CONFIG_FILE
 
 from certmaster.commonconfig import CMConfig
 
diff --git a/func/overlord/sslclient.py b/func/overlord/sslclient.py
index 8affced..e9cc4a6 100755
--- a/func/overlord/sslclient.py
+++ b/func/overlord/sslclient.py
@@ -2,7 +2,7 @@ import sys
 import xmlrpclib
 import urllib
 
-from func import SSLCommon
+from certmaster import SSLCommon
 
 
 class SSL_Transport(xmlrpclib.Transport):