Merge pull request #28776 from rallytime/bp-28740-2015.5

Back-port #28740 to 2015.5
This commit is contained in:
Nicole Thomas 2015-11-11 11:02:03 -07:00
commit 8f1d0b636e

View File

@ -27,6 +27,7 @@ import salt.utils.templates
import salt.utils.gzip_util
import salt.utils.http
import salt.utils.url
import salt.utils.s3
from salt.utils.openstack.swift import SaltSwift
# pylint: disable=no-name-in-module,import-error