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 #26020 from alekti/merge-pull-25750-to-2015.5

Browse source 
Correctly resolve conflict merging pull 25750 to 2015.5
This commit is contained in:
Justin Findlay 2015-08-05 08:16:58 -06:00
commit 5e17c5d230
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

@ -2935,7 +2935,7 @@ def get_managed(
file_sum = get_hash(source, form='sha256')
source_sum = {'hsum': file_sum, 'hash_type': 'sha256'}
elif source_hash:
protos = ('salt', 'http', 'https', 'ftp', 'swift', 's3')
protos = ('salt', 'http', 'https', 'ftp', 'swift', 's3', 'file')
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)