summaryrefslogtreecommitdiffstats
path: root/src/lib/Bcfg2/Server/Plugins
diff options
context:
space:
mode:
authorSol Jerome <sol.jerome@gmail.com>2014-09-10 20:20:04 -0500
committerSol Jerome <sol.jerome@gmail.com>2014-09-10 20:20:04 -0500
commit7eb61f7e6b721d86d2d30a96401f4e0281f4c966 (patch)
tree98a885068ff94af3cd56783b39d6e301a4b7d0a5 /src/lib/Bcfg2/Server/Plugins
parentf2209ac6fb7b86a91e052a33828861cabf185245 (diff)
parent9ffc3559ab4040fe8a02269db7ff94f8e9849af5 (diff)
downloadbcfg2-7eb61f7e6b721d86d2d30a96401f4e0281f4c966.tar.gz
bcfg2-7eb61f7e6b721d86d2d30a96401f4e0281f4c966.tar.bz2
bcfg2-7eb61f7e6b721d86d2d30a96401f4e0281f4c966.zip
Merge branch 'bcfg2-1.3.5-python2.4-compat' of https://github.com/fennm/bcfg2 into maint
Diffstat (limited to 'src/lib/Bcfg2/Server/Plugins')
-rw-r--r--src/lib/Bcfg2/Server/Plugins/Probes.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/Bcfg2/Server/Plugins/Probes.py b/src/lib/Bcfg2/Server/Plugins/Probes.py
index 48be1ac26..5d846b4bb 100644
--- a/src/lib/Bcfg2/Server/Plugins/Probes.py
+++ b/src/lib/Bcfg2/Server/Plugins/Probes.py
@@ -9,7 +9,7 @@ import operator
import lxml.etree
import Bcfg2.Server
import Bcfg2.Server.Plugin
-from Bcfg2.Compat import unicode # pylint: disable=W0622
+from Bcfg2.Compat import any, unicode # pylint: disable=W0622
try:
from django.db import models