Merge pull request #31181 from cachedout/lint_20158

Lint 2015.8 branch
2024-11-08 17:33:54 +00:00 · 2016-02-12 14:57:02 -07:00 · 2016-02-12 14:57:02 -07:00 · 1f22335e28
commit 1f22335e28
parent 4d1b49c1e7 4c0be11627
2 changed files with 1 additions and 2 deletions
--- a/salt/beacons/btmp.py
+++ b/salt/beacons/btmp.py
@ -58,7 +58,6 @@ def validate(config):
    if not isinstance(config, dict):
        return False, ('Configuration for btmp beacon must '
                       'be a list of dictionaries.')
-        return False
    return True, 'Valid beacon configuration'


--- a/salt/states/beacon.py
+++ b/salt/states/beacon.py
@ -29,7 +29,7 @@ Management of the Salt beacons
            - 1.0

 '''
-
+from __future__ import absolute_import
 import logging
 log = logging.getLogger(__name__)