saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #28777 from rallytime/bp-28740-2014.7

Browse source 
Back-port #28740 to 2014.7
This commit is contained in:
Nicole Thomas 2015-11-11 11:00:00 -07:00
commit 76e69b4bff
1 changed files with 1 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
salt/fileclient.py
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__)