Merge #30610 with pylint fix

This commit is contained in:
rallytime 2016-01-25 11:10:04 -07:00
parent e10a10050b
commit bf100c1ef5

View File

@ -89,7 +89,7 @@ import salt.utils.compat
import salt.utils
from salt.exceptions import SaltInvocationError
from salt.ext.six import string_types
from salt.ext.six.moves import range
from salt.ext.six.moves import range # pylint: disable=import-error
log = logging.getLogger(__name__)