Back-port #28740 to 2014.7

This commit is contained in:
Jarrod Moore 2015-11-10 22:08:36 +11:00 committed by rallytime
parent 45c73ebf2f
commit da5fac2b36

View file

@ -26,6 +26,7 @@ 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__)