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

fix bad merge 99fc7ec

Browse source
This commit is contained in:
Mark McGuire 2015-07-22 16:13:58 -05:00 • committed by rallytime
parent 00f4689fe3
commit 90d833d5dc
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
salt/modules/file.py
View file

@ -2771,7 +2771,7 @@ def get_managed(
elif source.startswith('/'):
source_sum = get_hash(source)
elif source_hash:
protos = ('salt', 'http', 'https', 'ftp', 'swift')
protos = ('salt', 'http', 'https', 'ftp', 'swift', 's3')
if _urlparse(source_hash).scheme in protos:
# The source_hash is a file on a server
hash_fn = __salt__['cp.cache_file'](source_hash, saltenv)