Merge pull request #28839 from cachedout/revert_28740

Revert #28740
This commit is contained in:
Nicole Thomas 2015-11-12 15:54:28 -07:00
commit 4b8bdd0afb

View file

@ -26,7 +26,6 @@ import salt.utils.templates
import salt.utils.gzip_util
from salt._compat import (
URLError, HTTPError, BaseHTTPServer, urlparse, urlunparse)
import salt.utils.s3
from salt.utils.openstack.swift import SaltSwift
log = logging.getLogger(__name__)